Skip to content

Fix edit tags & edit terminals buttons in settings #6236

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 30, 2021
Merged

Fix edit tags & edit terminals buttons in settings #6236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
093d6d0
Fix edit tags & edit terminals button
gave92 Sep 26, 2021
755441d
Switched to AsyncRelayCommand
gave92 Sep 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 20 additions & 5 deletions Files/ViewModels/SettingsViewModels/ExperimentalViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
using Microsoft.Toolkit.Mvvm.ComponentModel;
using Files.Helpers;
using Microsoft.Toolkit.Mvvm.ComponentModel;
using Microsoft.Toolkit.Mvvm.Input;
using System;
using System.Threading.Tasks;
using Windows.Foundation.Collections;
using Windows.Storage;
using Windows.System;

Expand All @@ -25,12 +28,24 @@ public bool AreFileTagsEnabled
}
}

public RelayCommand EditFileTagsCommand => new RelayCommand(() => LaunchFileTagsConfigFile());
public IRelayCommand EditFileTagsCommand => new AsyncRelayCommand(() => LaunchFileTagsConfigFile());

private async void LaunchFileTagsConfigFile()
private async Task LaunchFileTagsConfigFile()
{
await Launcher.LaunchFileAsync(
await StorageFile.GetFileFromApplicationUriAsync(new Uri("ms-appdata:///local/settings/filetags.json")));
var configFile = await StorageFile.GetFileFromApplicationUriAsync(new Uri("ms-appdata:///local/settings/filetags.json"));
if (!await Launcher.LaunchFileAsync(configFile))
{
var connection = await AppServiceConnectionHelper.Instance;
if (connection != null)
{
await connection.SendMessageAsync(new ValueSet()
{
{ "Arguments", "InvokeVerb" },
{ "FilePath", configFile.Path },
{ "Verb", "open" }
});
}
}
}
}
}
23 changes: 19 additions & 4 deletions Files/ViewModels/SettingsViewModels/PreferencesViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
using Files.DataModels;
using Files.Enums;
using Files.Helpers;
using Microsoft.Toolkit.Mvvm.ComponentModel;
using Microsoft.Toolkit.Mvvm.Input;
using Microsoft.Toolkit.Uwp;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Threading.Tasks;
using Windows.Foundation.Collections;
using Windows.Storage;
using Windows.System;

Expand Down Expand Up @@ -93,7 +96,7 @@ public Terminal SelectedTerminal
}
}

public RelayCommand EditTerminalApplicationsCommand => new RelayCommand(() => LaunchTerminalsConfigFile());
public IRelayCommand EditTerminalApplicationsCommand => new AsyncRelayCommand(() => LaunchTerminalsConfigFile());

public bool ShowConfirmDeleteDialog
{
Expand Down Expand Up @@ -125,10 +128,22 @@ public bool OpenFoldersNewTab
}
}

private async void LaunchTerminalsConfigFile()
private async Task LaunchTerminalsConfigFile()
{
await Launcher.LaunchFileAsync(
await StorageFile.GetFileFromApplicationUriAsync(new Uri("ms-appdata:///local/settings/terminal.json")));
var configFile = await StorageFile.GetFileFromApplicationUriAsync(new Uri("ms-appdata:///local/settings/terminal.json"));
if (!await Launcher.LaunchFileAsync(configFile))
{
var connection = await AppServiceConnectionHelper.Instance;
if (connection != null)
{
await connection.SendMessageAsync(new ValueSet()
{
{ "Arguments", "InvokeVerb" },
{ "FilePath", configFile.Path },
{ "Verb", "open" }
});
}
}
}
}
}