tasks settings added, app icon added
@@ -117,6 +117,15 @@
|
|||||||
<resheader name="writer">
|
<resheader name="writer">
|
||||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
</resheader>
|
</resheader>
|
||||||
|
<data name="MediaTypeOnlyAudio.Text" xml:space="preserve">
|
||||||
|
<value>Only audio</value>
|
||||||
|
</data>
|
||||||
|
<data name="MediaTypeOnlyVideo.Text" xml:space="preserve">
|
||||||
|
<value>Only video</value>
|
||||||
|
</data>
|
||||||
|
<data name="MediaTypeOriginal.Text" xml:space="preserve">
|
||||||
|
<value>Original</value>
|
||||||
|
</data>
|
||||||
<data name="StartAtMeteredConnectionDialogMessage" xml:space="preserve">
|
<data name="StartAtMeteredConnectionDialogMessage" xml:space="preserve">
|
||||||
<value>You are trying to download a video using a metered connection. Do you want to continue?</value>
|
<value>You are trying to download a video using a metered connection. Do you want to continue?</value>
|
||||||
</data>
|
</data>
|
||||||
|
|||||||
@@ -117,15 +117,6 @@
|
|||||||
<resheader name="writer">
|
<resheader name="writer">
|
||||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
</resheader>
|
</resheader>
|
||||||
<data name="MediaTypeOnlyAudio.Text" xml:space="preserve">
|
|
||||||
<value>Only audio</value>
|
|
||||||
</data>
|
|
||||||
<data name="MediaTypeOnlyVideo.Text" xml:space="preserve">
|
|
||||||
<value>Only video</value>
|
|
||||||
</data>
|
|
||||||
<data name="MediaTypeOriginal.Text" xml:space="preserve">
|
|
||||||
<value>Original</value>
|
|
||||||
</data>
|
|
||||||
<data name="StatusCancelled.Text" xml:space="preserve">
|
<data name="StatusCancelled.Text" xml:space="preserve">
|
||||||
<value>Cancelled</value>
|
<value>Cancelled</value>
|
||||||
</data>
|
</data>
|
||||||
|
|||||||
@@ -180,15 +180,6 @@
|
|||||||
<data name="MediaOptionsHeader.Text" xml:space="preserve">
|
<data name="MediaOptionsHeader.Text" xml:space="preserve">
|
||||||
<value>Media options</value>
|
<value>Media options</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="MediaTypeOnlyAudio.Text" xml:space="preserve">
|
|
||||||
<value>Only audio</value>
|
|
||||||
</data>
|
|
||||||
<data name="MediaTypeOnlyVideo.Text" xml:space="preserve">
|
|
||||||
<value>Only video</value>
|
|
||||||
</data>
|
|
||||||
<data name="MediaTypeOriginal.Text" xml:space="preserve">
|
|
||||||
<value>Original</value>
|
|
||||||
</data>
|
|
||||||
<data name="MediaTypeSettingsCard.Header" xml:space="preserve">
|
<data name="MediaTypeSettingsCard.Header" xml:space="preserve">
|
||||||
<value>Media type</value>
|
<value>Media type</value>
|
||||||
</data>
|
</data>
|
||||||
|
|||||||
@@ -144,15 +144,6 @@
|
|||||||
<data name="MediaOptionsHeader.Text" xml:space="preserve">
|
<data name="MediaOptionsHeader.Text" xml:space="preserve">
|
||||||
<value>Media options</value>
|
<value>Media options</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="MediaTypeOnlyAudio.Text" xml:space="preserve">
|
|
||||||
<value>Only audio</value>
|
|
||||||
</data>
|
|
||||||
<data name="MediaTypeOnlyVideo.Text" xml:space="preserve">
|
|
||||||
<value>Only video</value>
|
|
||||||
</data>
|
|
||||||
<data name="MediaTypeOriginal.Text" xml:space="preserve">
|
|
||||||
<value>Original</value>
|
|
||||||
</data>
|
|
||||||
<data name="MediaTypeSettingsCard.Header" xml:space="preserve">
|
<data name="MediaTypeSettingsCard.Header" xml:space="preserve">
|
||||||
<value>Media type</value>
|
<value>Media type</value>
|
||||||
</data>
|
</data>
|
||||||
|
|||||||
@@ -129,6 +129,39 @@
|
|||||||
<data name="SearchingPlaylistCount.Header" xml:space="preserve">
|
<data name="SearchingPlaylistCount.Header" xml:space="preserve">
|
||||||
<value>Default number of videos fetched from playlist</value>
|
<value>Default number of videos fetched from playlist</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="TasksAudioExtension.Header" xml:space="preserve">
|
||||||
|
<value>Audio extension</value>
|
||||||
|
</data>
|
||||||
|
<data name="TasksDefaultMediaOptions.Header" xml:space="preserve">
|
||||||
|
<value>Default media options</value>
|
||||||
|
</data>
|
||||||
|
<data name="TasksDefaultOutputDirectory.Header" xml:space="preserve">
|
||||||
|
<value>Default output directory</value>
|
||||||
|
</data>
|
||||||
|
<data name="TasksDefaultOutputDirectoryButton.Content" xml:space="preserve">
|
||||||
|
<value>Browse</value>
|
||||||
|
</data>
|
||||||
|
<data name="TasksFilenameTemplate.Header" xml:space="preserve">
|
||||||
|
<value>Filename template</value>
|
||||||
|
</data>
|
||||||
|
<data name="TasksHeader.Text" xml:space="preserve">
|
||||||
|
<value>Tasks</value>
|
||||||
|
</data>
|
||||||
|
<data name="TasksMediaType.Header" xml:space="preserve">
|
||||||
|
<value>Media type</value>
|
||||||
|
</data>
|
||||||
|
<data name="TasksRunningTasks.Header" xml:space="preserve">
|
||||||
|
<value>Maximum number of tasks running in parallel</value>
|
||||||
|
</data>
|
||||||
|
<data name="TasksSaveLastOutputDirectory.Description" xml:space="preserve">
|
||||||
|
<value>Otherwise, default directory defined below will be used</value>
|
||||||
|
</data>
|
||||||
|
<data name="TasksSaveLastOutputDirectory.Header" xml:space="preserve">
|
||||||
|
<value>Save last output directory</value>
|
||||||
|
</data>
|
||||||
|
<data name="TasksVideoExtension.Header" xml:space="preserve">
|
||||||
|
<value>Video extension</value>
|
||||||
|
</data>
|
||||||
<data name="TwitchHeader.Text" xml:space="preserve">
|
<data name="TwitchHeader.Text" xml:space="preserve">
|
||||||
<value>Twitch</value>
|
<value>Twitch</value>
|
||||||
</data>
|
</data>
|
||||||
|
|||||||
@@ -1,18 +1,26 @@
|
|||||||
using CommunityToolkit.Mvvm.ComponentModel;
|
using CommunityToolkit.Mvvm.ComponentModel;
|
||||||
|
using CommunityToolkit.Mvvm.Input;
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
|
using VDownload.Models;
|
||||||
|
using VDownload.Services.Data.Configuration;
|
||||||
using VDownload.Services.Data.Settings;
|
using VDownload.Services.Data.Settings;
|
||||||
|
using VDownload.Services.UI.StoragePicker;
|
||||||
|
using VDownload.Services.UI.StringResources;
|
||||||
|
|
||||||
namespace VDownload.Core.ViewModels.Settings
|
namespace VDownload.Core.ViewModels.Settings
|
||||||
{
|
{
|
||||||
public class SettingsViewModel : ObservableObject
|
public partial class SettingsViewModel : ObservableObject
|
||||||
{
|
{
|
||||||
#region SERVICES
|
#region SERVICES
|
||||||
|
|
||||||
protected readonly ISettingsService _settingsService;
|
protected readonly ISettingsService _settingsService;
|
||||||
|
protected readonly IConfigurationService _configurationService;
|
||||||
|
protected readonly IStringResourcesService _stringResourcesService;
|
||||||
|
protected readonly IStoragePickerService _storagePickerService;
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
@@ -26,6 +34,48 @@ namespace VDownload.Core.ViewModels.Settings
|
|||||||
set => SetProperty(_settingsService.Data.Common.Searching.MaxNumberOfVideosToGetFromPlaylist, value, _settingsService.Data.Common.Searching, (u, n) => u.MaxNumberOfVideosToGetFromPlaylist = n);
|
set => SetProperty(_settingsService.Data.Common.Searching.MaxNumberOfVideosToGetFromPlaylist, value, _settingsService.Data.Common.Searching, (u, n) => u.MaxNumberOfVideosToGetFromPlaylist = n);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public int TasksRunningTasks
|
||||||
|
{
|
||||||
|
get => _settingsService.Data.Common.Tasks.MaxNumberOfRunningTasks;
|
||||||
|
set => SetProperty(_settingsService.Data.Common.Tasks.MaxNumberOfRunningTasks, value, _settingsService.Data.Common.Tasks, (u, n) => u.MaxNumberOfRunningTasks = n);
|
||||||
|
}
|
||||||
|
|
||||||
|
public MediaType TasksMediaType
|
||||||
|
{
|
||||||
|
get => _settingsService.Data.Common.Tasks.DefaultMediaType;
|
||||||
|
set => SetProperty(_settingsService.Data.Common.Tasks.DefaultMediaType, value, _settingsService.Data.Common.Tasks, (u, n) => u.DefaultMediaType = n);
|
||||||
|
}
|
||||||
|
|
||||||
|
public VideoExtension TasksVideoExtension
|
||||||
|
{
|
||||||
|
get => _settingsService.Data.Common.Tasks.DefaultVideoExtension;
|
||||||
|
set => SetProperty(_settingsService.Data.Common.Tasks.DefaultVideoExtension, value, _settingsService.Data.Common.Tasks, (u, n) => u.DefaultVideoExtension = n);
|
||||||
|
}
|
||||||
|
|
||||||
|
public AudioExtension TasksAudioExtension
|
||||||
|
{
|
||||||
|
get => _settingsService.Data.Common.Tasks.DefaultAudioExtension;
|
||||||
|
set => SetProperty(_settingsService.Data.Common.Tasks.DefaultAudioExtension, value, _settingsService.Data.Common.Tasks, (u, n) => u.DefaultAudioExtension = n);
|
||||||
|
}
|
||||||
|
|
||||||
|
public string TasksFilenameTemplate
|
||||||
|
{
|
||||||
|
get => _settingsService.Data.Common.Tasks.FilenameTemplate;
|
||||||
|
set => SetProperty(_settingsService.Data.Common.Tasks.FilenameTemplate, value, _settingsService.Data.Common.Tasks, (u, n) => u.FilenameTemplate = n);
|
||||||
|
}
|
||||||
|
|
||||||
|
public bool TasksSaveLastOutputDirectory
|
||||||
|
{
|
||||||
|
get => _settingsService.Data.Common.Tasks.SaveLastOutputDirectory;
|
||||||
|
set => SetProperty(_settingsService.Data.Common.Tasks.SaveLastOutputDirectory, value, _settingsService.Data.Common.Tasks, (u, n) => u.SaveLastOutputDirectory = n);
|
||||||
|
}
|
||||||
|
|
||||||
|
public string TasksDefaultOutputDirectory
|
||||||
|
{
|
||||||
|
get => _settingsService.Data.Common.Tasks.DefaultOutputDirectory;
|
||||||
|
set => SetProperty(_settingsService.Data.Common.Tasks.DefaultOutputDirectory, value, _settingsService.Data.Common.Tasks, (u, n) => u.DefaultOutputDirectory = n);
|
||||||
|
}
|
||||||
|
|
||||||
public bool TwitchVodPassiveTrimming
|
public bool TwitchVodPassiveTrimming
|
||||||
{
|
{
|
||||||
get => _settingsService.Data.Twitch.Vod.PassiveTrimming;
|
get => _settingsService.Data.Twitch.Vod.PassiveTrimming;
|
||||||
@@ -56,17 +106,41 @@ namespace VDownload.Core.ViewModels.Settings
|
|||||||
set => SetProperty(_settingsService.Data.Twitch.Vod.ChunkDownloadingError.RetryDelay, value, _settingsService.Data.Twitch.Vod.ChunkDownloadingError, (u, n) => u.RetryDelay = n);
|
set => SetProperty(_settingsService.Data.Twitch.Vod.ChunkDownloadingError.RetryDelay, value, _settingsService.Data.Twitch.Vod.ChunkDownloadingError, (u, n) => u.RetryDelay = n);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[ObservableProperty]
|
||||||
|
protected string _tasksFilenameTemplateTooltip;
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#region CONSTRUCTORS
|
#region CONSTRUCTORS
|
||||||
|
|
||||||
public SettingsViewModel(ISettingsService settingsService)
|
public SettingsViewModel(ISettingsService settingsService, IConfigurationService configurationService, IStringResourcesService stringResourcesService, IStoragePickerService storagePickerService)
|
||||||
{
|
{
|
||||||
_settingsService = settingsService;
|
_settingsService = settingsService;
|
||||||
|
_configurationService = configurationService;
|
||||||
|
_stringResourcesService = stringResourcesService;
|
||||||
|
_storagePickerService = storagePickerService;
|
||||||
|
|
||||||
base.PropertyChanged += PropertyChangedEventHandler;
|
base.PropertyChanged += PropertyChangedEventHandler;
|
||||||
|
|
||||||
|
_tasksFilenameTemplateTooltip = string.Join('\n', _configurationService.Common.FilenameTemplates.Select(x => _stringResourcesService.FilenameTemplateResources.Get(x.Name)));
|
||||||
|
}
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
#region COMMANDS
|
||||||
|
|
||||||
|
[RelayCommand]
|
||||||
|
public async Task BrowseTasksDefaultOutputDirectory()
|
||||||
|
{
|
||||||
|
string? newDirectory = await _storagePickerService.OpenDirectory();
|
||||||
|
if (newDirectory is not null)
|
||||||
|
{
|
||||||
|
this.TasksDefaultOutputDirectory = newDirectory;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
using Microsoft.UI;
|
||||||
|
using Microsoft.UI.Windowing;
|
||||||
using Microsoft.UI.Xaml;
|
using Microsoft.UI.Xaml;
|
||||||
using Microsoft.UI.Xaml.Controls;
|
using Microsoft.UI.Xaml.Controls;
|
||||||
using Microsoft.UI.Xaml.Controls.Primitives;
|
using Microsoft.UI.Xaml.Controls.Primitives;
|
||||||
@@ -39,6 +41,7 @@ namespace VDownload.Core.Views
|
|||||||
public BaseWindow(BaseViewModel viewModel)
|
public BaseWindow(BaseViewModel viewModel)
|
||||||
{
|
{
|
||||||
this.InitializeComponent();
|
this.InitializeComponent();
|
||||||
|
this.Activated += BaseWindow_Activated;
|
||||||
|
|
||||||
this.ExtendsContentIntoTitleBar = true;
|
this.ExtendsContentIntoTitleBar = true;
|
||||||
this.SetTitleBar(this.AppTitleBar);
|
this.SetTitleBar(this.AppTitleBar);
|
||||||
@@ -54,6 +57,14 @@ namespace VDownload.Core.Views
|
|||||||
|
|
||||||
private void Root_Loaded(object sender, RoutedEventArgs e) => RootLoaded?.Invoke(this, EventArgs.Empty);
|
private void Root_Loaded(object sender, RoutedEventArgs e) => RootLoaded?.Invoke(this, EventArgs.Empty);
|
||||||
|
|
||||||
|
private void BaseWindow_Activated(object sender, WindowActivatedEventArgs args)
|
||||||
|
{
|
||||||
|
IntPtr windowHandle = WinRT.Interop.WindowNative.GetWindowHandle(this);
|
||||||
|
WindowId windowId = Win32Interop.GetWindowIdFromWindow(windowHandle);
|
||||||
|
AppWindow appWindow = AppWindow.GetFromWindowId(windowId);
|
||||||
|
appWindow.SetIcon(@"Assets\Logo\Logo.ico");
|
||||||
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -98,15 +98,15 @@
|
|||||||
Orientation="Horizontal">
|
Orientation="Horizontal">
|
||||||
<ctuc:SwitchPresenter Value="{Binding DownloadOptions.MediaType, Converter={StaticResource ObjectToStringConverter}}">
|
<ctuc:SwitchPresenter Value="{Binding DownloadOptions.MediaType, Converter={StaticResource ObjectToStringConverter}}">
|
||||||
<ctuc:Case Value="Original">
|
<ctuc:Case Value="Original">
|
||||||
<TextBlock x:Uid="/VDownload.Core.Strings/HomeDownloadsViewResources/MediaTypeOriginal"
|
<TextBlock x:Uid="/VDownload.Core.Strings/CommonResources/MediaTypeOriginal"
|
||||||
FontSize="{StaticResource TextSize}"/>
|
FontSize="{StaticResource TextSize}"/>
|
||||||
</ctuc:Case>
|
</ctuc:Case>
|
||||||
<ctuc:Case Value="OnlyVideo">
|
<ctuc:Case Value="OnlyVideo">
|
||||||
<TextBlock x:Uid="/VDownload.Core.Strings/HomeDownloadsViewResources/MediaTypeOnlyVideo"
|
<TextBlock x:Uid="/VDownload.Core.Strings/CommonResources/MediaTypeOnlyVideo"
|
||||||
FontSize="{StaticResource TextSize}"/>
|
FontSize="{StaticResource TextSize}"/>
|
||||||
</ctuc:Case>
|
</ctuc:Case>
|
||||||
<ctuc:Case Value="OnlyAudio">
|
<ctuc:Case Value="OnlyAudio">
|
||||||
<TextBlock x:Uid="/VDownload.Core.Strings/HomeDownloadsViewResources/MediaTypeOnlyAudio"
|
<TextBlock x:Uid="/VDownload.Core.Strings/CommonResources/MediaTypeOnlyAudio"
|
||||||
FontSize="{StaticResource TextSize}"/>
|
FontSize="{StaticResource TextSize}"/>
|
||||||
</ctuc:Case>
|
</ctuc:Case>
|
||||||
</ctuc:SwitchPresenter>
|
</ctuc:SwitchPresenter>
|
||||||
|
|||||||
@@ -311,13 +311,13 @@
|
|||||||
<DataTemplate>
|
<DataTemplate>
|
||||||
<ctuc:SwitchPresenter Value="{Binding Converter={StaticResource ObjectToStringConverter}}">
|
<ctuc:SwitchPresenter Value="{Binding Converter={StaticResource ObjectToStringConverter}}">
|
||||||
<ctuc:Case Value="Original">
|
<ctuc:Case Value="Original">
|
||||||
<TextBlock x:Uid="/VDownload.Core.Strings/HomePlaylistViewResources/MediaTypeOriginal"/>
|
<TextBlock x:Uid="/VDownload.Core.Strings/CommonResources/MediaTypeOriginal"/>
|
||||||
</ctuc:Case>
|
</ctuc:Case>
|
||||||
<ctuc:Case Value="OnlyVideo">
|
<ctuc:Case Value="OnlyVideo">
|
||||||
<TextBlock x:Uid="/VDownload.Core.Strings/HomePlaylistViewResources/MediaTypeOnlyVideo"/>
|
<TextBlock x:Uid="/VDownload.Core.Strings/CommonResources/MediaTypeOnlyVideo"/>
|
||||||
</ctuc:Case>
|
</ctuc:Case>
|
||||||
<ctuc:Case Value="OnlyAudio">
|
<ctuc:Case Value="OnlyAudio">
|
||||||
<TextBlock x:Uid="/VDownload.Core.Strings/HomePlaylistViewResources/MediaTypeOnlyAudio"/>
|
<TextBlock x:Uid="/VDownload.Core.Strings/CommonResources/MediaTypeOnlyAudio"/>
|
||||||
</ctuc:Case>
|
</ctuc:Case>
|
||||||
</ctuc:SwitchPresenter>
|
</ctuc:SwitchPresenter>
|
||||||
</DataTemplate>
|
</DataTemplate>
|
||||||
|
|||||||
@@ -111,13 +111,13 @@
|
|||||||
<DataTemplate>
|
<DataTemplate>
|
||||||
<ctuc:SwitchPresenter Value="{Binding Converter={StaticResource ObjectToStringConverter}}">
|
<ctuc:SwitchPresenter Value="{Binding Converter={StaticResource ObjectToStringConverter}}">
|
||||||
<ctuc:Case Value="Original">
|
<ctuc:Case Value="Original">
|
||||||
<TextBlock x:Uid="/VDownload.Core.Strings/HomeVideoViewResources/MediaTypeOriginal"/>
|
<TextBlock x:Uid="/VDownload.Core.Strings/CommonResources/MediaTypeOriginal"/>
|
||||||
</ctuc:Case>
|
</ctuc:Case>
|
||||||
<ctuc:Case Value="OnlyVideo">
|
<ctuc:Case Value="OnlyVideo">
|
||||||
<TextBlock x:Uid="/VDownload.Core.Strings/HomeVideoViewResources/MediaTypeOnlyVideo"/>
|
<TextBlock x:Uid="/VDownload.Core.Strings/CommonResources/MediaTypeOnlyVideo"/>
|
||||||
</ctuc:Case>
|
</ctuc:Case>
|
||||||
<ctuc:Case Value="OnlyAudio">
|
<ctuc:Case Value="OnlyAudio">
|
||||||
<TextBlock x:Uid="/VDownload.Core.Strings/HomeVideoViewResources/MediaTypeOnlyAudio"/>
|
<TextBlock x:Uid="/VDownload.Core.Strings/CommonResources/MediaTypeOnlyAudio"/>
|
||||||
</ctuc:Case>
|
</ctuc:Case>
|
||||||
</ctuc:SwitchPresenter>
|
</ctuc:SwitchPresenter>
|
||||||
</DataTemplate>
|
</DataTemplate>
|
||||||
|
|||||||
@@ -11,6 +11,7 @@
|
|||||||
xmlns:ct="using:CommunityToolkit.WinUI"
|
xmlns:ct="using:CommunityToolkit.WinUI"
|
||||||
xmlns:i="using:Microsoft.Xaml.Interactivity"
|
xmlns:i="using:Microsoft.Xaml.Interactivity"
|
||||||
xmlns:ic="using:Microsoft.Xaml.Interactions.Core"
|
xmlns:ic="using:Microsoft.Xaml.Interactions.Core"
|
||||||
|
xmlns:m="using:VDownload.Models"
|
||||||
mc:Ignorable="d"
|
mc:Ignorable="d"
|
||||||
Background="{ThemeResource ViewBackgroundColor}">
|
Background="{ThemeResource ViewBackgroundColor}">
|
||||||
|
|
||||||
@@ -42,6 +43,81 @@
|
|||||||
SpinButtonPlacementMode="Compact"/>
|
SpinButtonPlacementMode="Compact"/>
|
||||||
</ctc:SettingsCard>
|
</ctc:SettingsCard>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
<StackPanel Spacing="5">
|
||||||
|
<TextBlock x:Uid="/VDownload.Core.Strings/SettingsViewResources/TasksHeader"
|
||||||
|
FontWeight="Bold"
|
||||||
|
FontSize="15"/>
|
||||||
|
<ctc:SettingsCard x:Uid="/VDownload.Core.Strings/SettingsViewResources/TasksRunningTasks">
|
||||||
|
<ctc:SettingsCard.HeaderIcon>
|
||||||
|
<BitmapIcon ShowAsMonochrome="False"
|
||||||
|
UriSource="{ThemeResource ImageSettingsViewTasksRunningTasks}"/>
|
||||||
|
</ctc:SettingsCard.HeaderIcon>
|
||||||
|
<NumberBox Value="{Binding TasksRunningTasks, Mode=TwoWay}"
|
||||||
|
Minimum="1"
|
||||||
|
SmallChange="1"
|
||||||
|
LargeChange="10"
|
||||||
|
SpinButtonPlacementMode="Compact"/>
|
||||||
|
</ctc:SettingsCard>
|
||||||
|
<ctc:SettingsExpander x:Uid="/VDownload.Core.Strings/SettingsViewResources/TasksDefaultMediaOptions">
|
||||||
|
<ctc:SettingsExpander.HeaderIcon>
|
||||||
|
<BitmapIcon ShowAsMonochrome="False"
|
||||||
|
UriSource="{ThemeResource ImageSettingsViewTasksDefaultMediaOptions}"/>
|
||||||
|
</ctc:SettingsExpander.HeaderIcon>
|
||||||
|
<ctc:SettingsExpander.Items>
|
||||||
|
<ctc:SettingsCard x:Uid="/VDownload.Core.Strings/SettingsViewResources/TasksMediaType">
|
||||||
|
<ComboBox ItemsSource="{ct:EnumValues Type=m:MediaType}"
|
||||||
|
SelectedItem="{Binding TasksMediaType, Mode=TwoWay}">
|
||||||
|
<ComboBox.ItemTemplate>
|
||||||
|
<DataTemplate>
|
||||||
|
<ctuc:SwitchPresenter Value="{Binding Converter={StaticResource ObjectToStringConverter}}">
|
||||||
|
<ctuc:Case Value="Original">
|
||||||
|
<TextBlock x:Uid="/VDownload.Core.Strings/CommonResources/MediaTypeOriginal"/>
|
||||||
|
</ctuc:Case>
|
||||||
|
<ctuc:Case Value="OnlyVideo">
|
||||||
|
<TextBlock x:Uid="/VDownload.Core.Strings/CommonResources/MediaTypeOnlyVideo"/>
|
||||||
|
</ctuc:Case>
|
||||||
|
<ctuc:Case Value="OnlyAudio">
|
||||||
|
<TextBlock x:Uid="/VDownload.Core.Strings/CommonResources/MediaTypeOnlyAudio"/>
|
||||||
|
</ctuc:Case>
|
||||||
|
</ctuc:SwitchPresenter>
|
||||||
|
</DataTemplate>
|
||||||
|
</ComboBox.ItemTemplate>
|
||||||
|
</ComboBox>
|
||||||
|
</ctc:SettingsCard>
|
||||||
|
<ctc:SettingsCard x:Uid="/VDownload.Core.Strings/SettingsViewResources/TasksVideoExtension">
|
||||||
|
<ComboBox ItemsSource="{ct:EnumValues Type=m:VideoExtension}"
|
||||||
|
SelectedItem="{Binding TasksVideoExtension, Mode=TwoWay}"/>
|
||||||
|
</ctc:SettingsCard>
|
||||||
|
<ctc:SettingsCard x:Uid="/VDownload.Core.Strings/SettingsViewResources/TasksAudioExtension">
|
||||||
|
<ComboBox ItemsSource="{ct:EnumValues Type=m:AudioExtension}"
|
||||||
|
SelectedItem="{Binding TasksAudioExtension, Mode=TwoWay}"/>
|
||||||
|
</ctc:SettingsCard>
|
||||||
|
</ctc:SettingsExpander.Items>
|
||||||
|
</ctc:SettingsExpander>
|
||||||
|
<ctc:SettingsCard x:Uid="/VDownload.Core.Strings/SettingsViewResources/TasksFilenameTemplate">
|
||||||
|
<ctc:SettingsCard.HeaderIcon>
|
||||||
|
<BitmapIcon ShowAsMonochrome="False"
|
||||||
|
UriSource="{ThemeResource ImageSettingsViewTasksFilenameTemplate}"/>
|
||||||
|
</ctc:SettingsCard.HeaderIcon>
|
||||||
|
<TextBox Text="{Binding TasksFilenameTemplate, Mode=TwoWay}"
|
||||||
|
ToolTipService.ToolTip="{Binding TasksFilenameTemplateTooltip}"/>
|
||||||
|
</ctc:SettingsCard>
|
||||||
|
<ctc:SettingsExpander x:Uid="/VDownload.Core.Strings/SettingsViewResources/TasksSaveLastOutputDirectory">
|
||||||
|
<ctc:SettingsExpander.HeaderIcon>
|
||||||
|
<BitmapIcon ShowAsMonochrome="False"
|
||||||
|
UriSource="{ThemeResource ImageSettingsViewTasksOutputDirectory}"/>
|
||||||
|
</ctc:SettingsExpander.HeaderIcon>
|
||||||
|
<ToggleSwitch IsOn="{Binding TasksSaveLastOutputDirectory, Mode=TwoWay}"/>
|
||||||
|
<ctc:SettingsExpander.Items>
|
||||||
|
<ctc:SettingsCard x:Uid="/VDownload.Core.Strings/SettingsViewResources/TasksDefaultOutputDirectory"
|
||||||
|
IsEnabled="{Binding TasksSaveLastOutputDirectory, Converter={StaticResource BoolNegationConverter}}"
|
||||||
|
Description="{Binding TasksDefaultOutputDirectory}">
|
||||||
|
<Button x:Uid="/VDownload.Core.Strings/SettingsViewResources/TasksDefaultOutputDirectoryButton"
|
||||||
|
Command="{Binding BrowseTasksDefaultOutputDirectoryCommand}"/>
|
||||||
|
</ctc:SettingsCard>
|
||||||
|
</ctc:SettingsExpander.Items>
|
||||||
|
</ctc:SettingsExpander>
|
||||||
|
</StackPanel>
|
||||||
<StackPanel Spacing="5">
|
<StackPanel Spacing="5">
|
||||||
<TextBlock x:Uid="/VDownload.Core.Strings/SettingsViewResources/TwitchHeader"
|
<TextBlock x:Uid="/VDownload.Core.Strings/SettingsViewResources/TwitchHeader"
|
||||||
FontWeight="Bold"
|
FontWeight="Bold"
|
||||||
|
|||||||
@@ -16,6 +16,7 @@ namespace VDownload.Services.UI.StringResources
|
|||||||
StringResources CommonResources { get; }
|
StringResources CommonResources { get; }
|
||||||
StringResources DialogButtonsResources { get; }
|
StringResources DialogButtonsResources { get; }
|
||||||
StringResources SettingsViewResources { get; }
|
StringResources SettingsViewResources { get; }
|
||||||
|
StringResources FilenameTemplateResources { get; }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -43,6 +44,7 @@ namespace VDownload.Services.UI.StringResources
|
|||||||
public StringResources CommonResources { get; protected set; }
|
public StringResources CommonResources { get; protected set; }
|
||||||
public StringResources DialogButtonsResources { get; protected set; }
|
public StringResources DialogButtonsResources { get; protected set; }
|
||||||
public StringResources SettingsViewResources { get; protected set; }
|
public StringResources SettingsViewResources { get; protected set; }
|
||||||
|
public StringResources FilenameTemplateResources { get; protected set; }
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
@@ -65,6 +67,7 @@ namespace VDownload.Services.UI.StringResources
|
|||||||
CommonResources = BuildResource("CommonResources");
|
CommonResources = BuildResource("CommonResources");
|
||||||
DialogButtonsResources = BuildResource("DialogButtonsResources");
|
DialogButtonsResources = BuildResource("DialogButtonsResources");
|
||||||
SettingsViewResources = BuildResource("SettingsViewResources");
|
SettingsViewResources = BuildResource("SettingsViewResources");
|
||||||
|
FilenameTemplateResources = BuildResource("FilenameTemplateResources");
|
||||||
}
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|||||||
BIN
VDownload/Assets/Logo/Logo.ico
Normal file
|
After Width: | Height: | Size: 18 KiB |
BIN
VDownload/Assets/SettingsView/TasksDefaultMediaOptionsDark.png
Normal file
|
After Width: | Height: | Size: 31 KiB |
BIN
VDownload/Assets/SettingsView/TasksDefaultMediaOptionsLight.png
Normal file
|
After Width: | Height: | Size: 18 KiB |
BIN
VDownload/Assets/SettingsView/TasksFilenameTemplateDark.png
Normal file
|
After Width: | Height: | Size: 18 KiB |
BIN
VDownload/Assets/SettingsView/TasksFilenameTemplateLight.png
Normal file
|
After Width: | Height: | Size: 27 KiB |
BIN
VDownload/Assets/SettingsView/TasksOutputDirectoryDark.png
Normal file
|
After Width: | Height: | Size: 18 KiB |
BIN
VDownload/Assets/SettingsView/TasksOutputDirectoryLight.png
Normal file
|
After Width: | Height: | Size: 24 KiB |
BIN
VDownload/Assets/SettingsView/TasksRunningTasksDark.png
Normal file
|
After Width: | Height: | Size: 19 KiB |
BIN
VDownload/Assets/SettingsView/TasksRunningTasksLight.png
Normal file
|
After Width: | Height: | Size: 27 KiB |
@@ -12,4 +12,5 @@
|
|||||||
|
|
||||||
<ct:StringFormatConverter x:Key="StringFormatConverter"/>
|
<ct:StringFormatConverter x:Key="StringFormatConverter"/>
|
||||||
<ct:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter"/>
|
<ct:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter"/>
|
||||||
|
<ct:BoolNegationConverter x:Key="BoolNegationConverter"/>
|
||||||
</ResourceDictionary>
|
</ResourceDictionary>
|
||||||
|
|||||||
@@ -3,4 +3,5 @@
|
|||||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
|
||||||
<x:String x:Key="ImageLogo">/Assets/Logo/Logo.png</x:String>
|
<x:String x:Key="ImageLogo">/Assets/Logo/Logo.png</x:String>
|
||||||
|
<x:String x:Key="ImageLogoIcon">/Assets/Logo/Logo.ico</x:String>
|
||||||
</ResourceDictionary>
|
</ResourceDictionary>
|
||||||
|
|||||||
@@ -5,9 +5,17 @@
|
|||||||
<ResourceDictionary.ThemeDictionaries>
|
<ResourceDictionary.ThemeDictionaries>
|
||||||
<ResourceDictionary x:Key="Light">
|
<ResourceDictionary x:Key="Light">
|
||||||
<x:String x:Key="ImageSettingsViewSearchingPlaylistCount">/Assets/SettingsView/SearchingPlaylistCountLight.png</x:String>
|
<x:String x:Key="ImageSettingsViewSearchingPlaylistCount">/Assets/SettingsView/SearchingPlaylistCountLight.png</x:String>
|
||||||
|
<x:String x:Key="ImageSettingsViewTasksDefaultMediaOptions">/Assets/SettingsView/TasksDefaultMediaOptionsLight.png</x:String>
|
||||||
|
<x:String x:Key="ImageSettingsViewTasksRunningTasks">/Assets/SettingsView/TasksRunningTasksLight.png</x:String>
|
||||||
|
<x:String x:Key="ImageSettingsViewTasksFilenameTemplate">/Assets/SettingsView/TasksFilenameTemplateLight.png</x:String>
|
||||||
|
<x:String x:Key="ImageSettingsViewTasksOutputDirectory">/Assets/SettingsView/TasksOutputDirectoryLight.png</x:String>
|
||||||
</ResourceDictionary>
|
</ResourceDictionary>
|
||||||
<ResourceDictionary x:Key="Dark">
|
<ResourceDictionary x:Key="Dark">
|
||||||
<x:String x:Key="ImageSettingsViewSearchingPlaylistCount">/Assets/SettingsView/SearchingPlaylistCountDark.png</x:String>
|
<x:String x:Key="ImageSettingsViewSearchingPlaylistCount">/Assets/SettingsView/SearchingPlaylistCountDark.png</x:String>
|
||||||
|
<x:String x:Key="ImageSettingsViewTasksDefaultMediaOptions">/Assets/SettingsView/TasksDefaultMediaOptionsDark.png</x:String>
|
||||||
|
<x:String x:Key="ImageSettingsViewTasksRunningTasks">/Assets/SettingsView/TasksRunningTasksDark.png</x:String>
|
||||||
|
<x:String x:Key="ImageSettingsViewTasksFilenameTemplate">/Assets/SettingsView/TasksFilenameTemplateDark.png</x:String>
|
||||||
|
<x:String x:Key="ImageSettingsViewTasksOutputDirectory">/Assets/SettingsView/TasksOutputDirectoryDark.png</x:String>
|
||||||
</ResourceDictionary>
|
</ResourceDictionary>
|
||||||
</ResourceDictionary.ThemeDictionaries>
|
</ResourceDictionary.ThemeDictionaries>
|
||||||
</ResourceDictionary>
|
</ResourceDictionary>
|
||||||
|
|||||||
@@ -13,6 +13,7 @@
|
|||||||
<WindowsAppSDKSelfContained>true</WindowsAppSDKSelfContained>
|
<WindowsAppSDKSelfContained>true</WindowsAppSDKSelfContained>
|
||||||
<UseRidGraph>true</UseRidGraph>
|
<UseRidGraph>true</UseRidGraph>
|
||||||
<EnableCoreMrtTooling Condition=" '$(BuildingInsideVisualStudio)' != 'true' ">false</EnableCoreMrtTooling>
|
<EnableCoreMrtTooling Condition=" '$(BuildingInsideVisualStudio)' != 'true' ">false</EnableCoreMrtTooling>
|
||||||
|
<ApplicationIcon>Assets\Logo\Logo.ico</ApplicationIcon>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Content Remove="Assets\BaseView\AuthenticationDark.png" />
|
<Content Remove="Assets\BaseView\AuthenticationDark.png" />
|
||||||
@@ -76,8 +77,6 @@
|
|||||||
<Content Remove="Assets\HomeVideoView\FilenameLight.png" />
|
<Content Remove="Assets\HomeVideoView\FilenameLight.png" />
|
||||||
<Content Remove="Assets\HomeVideoView\MediaDark.png" />
|
<Content Remove="Assets\HomeVideoView\MediaDark.png" />
|
||||||
<Content Remove="Assets\HomeVideoView\MediaLight.png" />
|
<Content Remove="Assets\HomeVideoView\MediaLight.png" />
|
||||||
<Content Remove="Assets\HomeVideoView\QualityDark.png" />
|
|
||||||
<Content Remove="Assets\HomeVideoView\QualityLight.png" />
|
|
||||||
<Content Remove="Assets\HomeVideoView\TimeDark.png" />
|
<Content Remove="Assets\HomeVideoView\TimeDark.png" />
|
||||||
<Content Remove="Assets\HomeVideoView\TimeLight.png" />
|
<Content Remove="Assets\HomeVideoView\TimeLight.png" />
|
||||||
<Content Remove="Assets\HomeVideoView\TrimDark.png" />
|
<Content Remove="Assets\HomeVideoView\TrimDark.png" />
|
||||||
@@ -96,6 +95,10 @@
|
|||||||
<Content Remove="Assets\Logo\Square44x44Logo.altform-unplated_targetsize-256.png" />
|
<Content Remove="Assets\Logo\Square44x44Logo.altform-unplated_targetsize-256.png" />
|
||||||
<Content Remove="Assets\Logo\Square44x44Logo.altform-unplated_targetsize-32.png" />
|
<Content Remove="Assets\Logo\Square44x44Logo.altform-unplated_targetsize-32.png" />
|
||||||
<Content Remove="Assets\Logo\Square44x44Logo.altform-unplated_targetsize-48.png" />
|
<Content Remove="Assets\Logo\Square44x44Logo.altform-unplated_targetsize-48.png" />
|
||||||
|
<Content Remove="Assets\SettingsView\TasksFilenameTemplateDark.png" />
|
||||||
|
<Content Remove="Assets\SettingsView\TasksFilenameTemplateLight.png" />
|
||||||
|
<Content Remove="Assets\SettingsView\TasksOutputDirectoryDark.png" />
|
||||||
|
<Content Remove="Assets\SettingsView\TasksOutputDirectoryLight.png" />
|
||||||
<Content Remove="Assets\Sources\Twitch.png" />
|
<Content Remove="Assets\Sources\Twitch.png" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
@@ -139,6 +142,8 @@
|
|||||||
<None Remove="Assets\Logo\Wide310x150Logo.scale-150.png" />
|
<None Remove="Assets\Logo\Wide310x150Logo.scale-150.png" />
|
||||||
<None Remove="Assets\Logo\Wide310x150Logo.scale-200.png" />
|
<None Remove="Assets\Logo\Wide310x150Logo.scale-200.png" />
|
||||||
<None Remove="Assets\Logo\Wide310x150Logo.scale-400.png" />
|
<None Remove="Assets\Logo\Wide310x150Logo.scale-400.png" />
|
||||||
|
<None Remove="Assets\SettingsView\TasksDefaultMediaOptionsDark.png" />
|
||||||
|
<None Remove="Assets\SettingsView\TasksDefaultMediaOptionsLight.png" />
|
||||||
<None Remove="Dictionaries\Colors.xaml" />
|
<None Remove="Dictionaries\Colors.xaml" />
|
||||||
<None Remove="Dictionaries\Converters.xaml" />
|
<None Remove="Dictionaries\Converters.xaml" />
|
||||||
<None Remove="Dictionaries\Images\ImagesBaseView.xaml" />
|
<None Remove="Dictionaries\Images\ImagesBaseView.xaml" />
|
||||||
@@ -190,9 +195,27 @@
|
|||||||
<ProjectReference Include="..\VDownload.Sources\VDownload.Sources\VDownload.Sources.csproj" />
|
<ProjectReference Include="..\VDownload.Sources\VDownload.Sources\VDownload.Sources.csproj" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
<Content Update="Assets\HomeVideoView\QualityDark.png">
|
||||||
|
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||||
|
</Content>
|
||||||
|
<Content Update="Assets\HomeVideoView\QualityLight.png">
|
||||||
|
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||||
|
</Content>
|
||||||
<Content Update="Assets\Other\Thumbnail.png">
|
<Content Update="Assets\Other\Thumbnail.png">
|
||||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||||
</Content>
|
</Content>
|
||||||
|
<Content Update="Assets\SettingsView\TasksDefaultMediaOptionsDark.png">
|
||||||
|
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||||
|
</Content>
|
||||||
|
<Content Update="Assets\SettingsView\TasksDefaultMediaOptionsLight.png">
|
||||||
|
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||||
|
</Content>
|
||||||
|
<Content Update="Assets\SettingsView\TasksRunningTasksDark.png">
|
||||||
|
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||||
|
</Content>
|
||||||
|
<Content Update="Assets\SettingsView\TasksRunningTasksLight.png">
|
||||||
|
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||||
|
</Content>
|
||||||
<Content Update="Assets\SettingsView\SearchingPlaylistCountDark.png">
|
<Content Update="Assets\SettingsView\SearchingPlaylistCountDark.png">
|
||||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||||
</Content>
|
</Content>
|
||||||
@@ -411,9 +434,24 @@
|
|||||||
<None Update="Assets\HomeView\Error.png">
|
<None Update="Assets\HomeView\Error.png">
|
||||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||||
</None>
|
</None>
|
||||||
|
<None Update="Assets\Logo\Logo.ico">
|
||||||
|
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||||
|
</None>
|
||||||
<None Update="Assets\Logo\Logo.png">
|
<None Update="Assets\Logo\Logo.png">
|
||||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||||
</None>
|
</None>
|
||||||
|
<None Update="Assets\SettingsView\TasksOutputDirectoryDark.png">
|
||||||
|
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||||
|
</None>
|
||||||
|
<None Update="Assets\SettingsView\TasksOutputDirectoryLight.png">
|
||||||
|
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||||
|
</None>
|
||||||
|
<None Update="Assets\SettingsView\TasksFilenameTemplateDark.png">
|
||||||
|
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||||
|
</None>
|
||||||
|
<None Update="Assets\SettingsView\TasksFilenameTemplateLight.png">
|
||||||
|
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||||
|
</None>
|
||||||
<None Update="Assets\Sources\Twitch.png">
|
<None Update="Assets\Sources\Twitch.png">
|
||||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||||
</None>
|
</None>
|
||||||
|
|||||||