From b0f658efe1fd1d4c363ddf1cb3238611cb79992e Mon Sep 17 00:00:00 2001 From: Adrien Allard Date: Mon, 10 Jun 2019 09:56:45 +0200 Subject: [PATCH] Added: Possibility to move presets and folders in the tree. --- .../ConversionJobs/ConversionJob_Gif.cs | 2 +- .../ConversionJobs/ConversionJob_Ico.cs | 2 +- .../ConversionPreset/ConversionPreset.cs | 5 +- .../FileConverter/FileConverter.csproj | 2 +- .../SampleData/SettingsSampleData.xaml | 64 +++-- .../FileConverter/ViewModels/PresetFolder.cs | 105 -------- .../FileConverter/ViewModels/PresetNode.cs | 134 ++++++++++ .../ViewModels/SettingsViewModel.cs | 235 ++++++++++++------ .../FileConverter/Views/SettingsWindow.xaml | 31 ++- .../Views/SettingsWindow.xaml.cs | 8 +- 10 files changed, 364 insertions(+), 224 deletions(-) delete mode 100644 Application/FileConverter/ViewModels/PresetFolder.cs create mode 100644 Application/FileConverter/ViewModels/PresetNode.cs diff --git a/Application/FileConverter/ConversionJobs/ConversionJob_Gif.cs b/Application/FileConverter/ConversionJobs/ConversionJob_Gif.cs index 5fd0123..34c383c 100644 --- a/Application/FileConverter/ConversionJobs/ConversionJob_Gif.cs +++ b/Application/FileConverter/ConversionJobs/ConversionJob_Gif.cs @@ -47,7 +47,7 @@ namespace FileConverter.ConversionJobs this.intermediateFilePath = PathHelpers.GenerateUniquePath(tempPath + fileName + ".png"); // Convert input in png file to send it to ffmpeg for the gif conversion. - ConversionPreset intermediatePreset = new ConversionPreset("To compatible image", null, OutputType.Png, this.ConversionPreset.InputTypes.ToArray()); + ConversionPreset intermediatePreset = new ConversionPreset("To compatible image", OutputType.Png, this.ConversionPreset.InputTypes.ToArray()); this.pngConversionJob = ConversionJobFactory.Create(intermediatePreset, this.InputFilePath); this.pngConversionJob.PrepareConversion(this.intermediateFilePath); diff --git a/Application/FileConverter/ConversionJobs/ConversionJob_Ico.cs b/Application/FileConverter/ConversionJobs/ConversionJob_Ico.cs index c0d252a..2659cd1 100644 --- a/Application/FileConverter/ConversionJobs/ConversionJob_Ico.cs +++ b/Application/FileConverter/ConversionJobs/ConversionJob_Ico.cs @@ -38,7 +38,7 @@ namespace FileConverter.ConversionJobs this.intermediateFilePath = PathHelpers.GenerateUniquePath(tempPath + fileName + ".png"); // Convert input in png file to send it to ffmpeg for the ico conversion. - ConversionPreset intermediatePreset = new ConversionPreset("To compatible image", null, OutputType.Png, this.ConversionPreset.InputTypes.ToArray()); + ConversionPreset intermediatePreset = new ConversionPreset("To compatible image", OutputType.Png, this.ConversionPreset.InputTypes.ToArray()); intermediatePreset.SetSettingsValue(ConversionPreset.ConversionSettingKeys.ImageClampSizePowerOf2, "True"); intermediatePreset.SetSettingsValue(ConversionPreset.ConversionSettingKeys.ImageMaximumSize, "256"); this.pngConversionJob = ConversionJobFactory.Create(intermediatePreset, this.InputFilePath); diff --git a/Application/FileConverter/ConversionPreset/ConversionPreset.cs b/Application/FileConverter/ConversionPreset/ConversionPreset.cs index 1c23635..c732e1c 100644 --- a/Application/FileConverter/ConversionPreset/ConversionPreset.cs +++ b/Application/FileConverter/ConversionPreset/ConversionPreset.cs @@ -32,10 +32,9 @@ namespace FileConverter this.FullName = Properties.Resources.DefaultPresetName; } - public ConversionPreset(string shortName, string[] parentFoldersNames, OutputType outputType, params string[] inputTypes) + public ConversionPreset(string shortName, OutputType outputType, params string[] inputTypes) { this.ShortName = shortName; - this.ParentFoldersNames = parentFoldersNames; this.OutputType = outputType; List inputTypeList = new List(); inputTypeList.AddRange(inputTypes); @@ -122,7 +121,7 @@ namespace FileConverter public string[] ParentFoldersNames { get; - private set; + set; } [XmlAttribute] diff --git a/Application/FileConverter/FileConverter.csproj b/Application/FileConverter/FileConverter.csproj index b0a834a..aa27337 100644 --- a/Application/FileConverter/FileConverter.csproj +++ b/Application/FileConverter/FileConverter.csproj @@ -222,7 +222,7 @@ - + diff --git a/Application/FileConverter/SampleData/SettingsSampleData.xaml b/Application/FileConverter/SampleData/SettingsSampleData.xaml index df3ae8e..49693e1 100644 --- a/Application/FileConverter/SampleData/SettingsSampleData.xaml +++ b/Application/FileConverter/SampleData/SettingsSampleData.xaml @@ -15,27 +15,55 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + diff --git a/Application/FileConverter/ViewModels/PresetFolder.cs b/Application/FileConverter/ViewModels/PresetFolder.cs deleted file mode 100644 index 3ca0ef1..0000000 --- a/Application/FileConverter/ViewModels/PresetFolder.cs +++ /dev/null @@ -1,105 +0,0 @@ -// License: http://www.gnu.org/licenses/gpl.html GPL version 3. - -using System; -using System.Collections.ObjectModel; -using GalaSoft.MvvmLight; - -namespace FileConverter.ViewModels -{ - public class PresetFolder : ObservableObject - { - private string name; - private ObservableCollection children = new ObservableCollection(); - - public PresetFolder(string name, string[] parents) - { - this.Name = name; - this.ParentFoldersNames = parents; - } - -#if DEBUG - public PresetFolder() - { - } -#endif - - public string Name - { - get => this.name; - - set - { - this.name = value; - - this.RaisePropertyChanged(); - } - } - - public string[] ParentFoldersNames - { - get; - private set; - } - - public string[] FoldersNames - { - get - { - string[] folders; - if (this.ParentFoldersNames == null) - { - if (this.name == null) - { - // Root folder have no name. - return null; - } - - folders = new string[1]; - } - else - { - Diagnostics.Debug.Assert(this.name != null, "Preset folder name should not be null."); - - folders = new string[this.ParentFoldersNames.Length + 1]; - System.Array.Copy(this.ParentFoldersNames, folders, this.ParentFoldersNames.Length); - } - - folders[folders.Length - 1] = this.name; - return folders; - } - } - - public ObservableCollection Children - { - get => this.children; - - set - { - this.children = value; - this.RaisePropertyChanged(); - } - } - - public bool IsNodeInHierarchy(ObservableObject node, bool recurse) - { - Diagnostics.Debug.Assert(node != null, "node != null"); - foreach (ObservableObject child in this.Children) - { - if (child == node) - { - return true; - } - - if (recurse && child is PresetFolder subFolder) - { - if (subFolder.IsNodeInHierarchy(node, true)) - { - return true; - } - } - } - - return false; - } - } -} diff --git a/Application/FileConverter/ViewModels/PresetNode.cs b/Application/FileConverter/ViewModels/PresetNode.cs new file mode 100644 index 0000000..af9e8a4 --- /dev/null +++ b/Application/FileConverter/ViewModels/PresetNode.cs @@ -0,0 +1,134 @@ +// License: http://www.gnu.org/licenses/gpl.html GPL version 3. + +using System; +using System.Collections.ObjectModel; +using GalaSoft.MvvmLight; + +namespace FileConverter.ViewModels +{ + public abstract class AbstractTreeNode : ObservableObject + { + private PresetFolderNode parent; + + protected AbstractTreeNode(PresetFolderNode parent) + { + this.Parent = parent; + } + +#if DEBUG + protected AbstractTreeNode() + { + } +#endif + + public PresetFolderNode Parent + { + get => this.parent; + set + { + this.parent = value; + this.RaisePropertyChanged(); + } + } + + public abstract string Name + { + get; + set; + } + } + + public class PresetNode : AbstractTreeNode + { + public PresetNode(ConversionPreset preset, PresetFolderNode parent) : base(parent) + { + this.Preset = preset; + } + +#if DEBUG + public PresetNode() : base() + { + } +#endif + + public ConversionPreset Preset + { + get; +#if DEBUG + set; +#endif + } + + public override string Name + { + get => this.Preset.ShortName; + + set + { + this.Preset.ShortName = value; + this.RaisePropertyChanged(); + } + } + } + + public class PresetFolderNode : AbstractTreeNode + { + private string name; + private ObservableCollection children = new ObservableCollection(); + + public PresetFolderNode(string name, PresetFolderNode parent) : base(parent) + { + this.Name = name; + } + +#if DEBUG + public PresetFolderNode() : base() + { + } +#endif + + public override string Name + { + get => this.name; + + set + { + this.name = value; + this.RaisePropertyChanged(); + } + } + + public ObservableCollection Children + { + get => this.children; + + set + { + this.children = value; + this.RaisePropertyChanged(); + } + } + + public bool IsNodeInHierarchy(AbstractTreeNode node, bool recurse) + { + Diagnostics.Debug.Assert(node != null, "node != null"); + foreach (ObservableObject child in this.Children) + { + if (child == node) + { + return true; + } + + if (recurse && child is PresetFolderNode subFolder) + { + if (subFolder.IsNodeInHierarchy(node, true)) + { + return true; + } + } + } + + return false; + } + } +} diff --git a/Application/FileConverter/ViewModels/SettingsViewModel.cs b/Application/FileConverter/ViewModels/SettingsViewModel.cs index 76683ad..47b6fc7 100644 --- a/Application/FileConverter/ViewModels/SettingsViewModel.cs +++ b/Application/FileConverter/ViewModels/SettingsViewModel.cs @@ -37,9 +37,9 @@ namespace FileConverter.ViewModels public class SettingsViewModel : ViewModelBase { private InputExtensionCategory[] inputCategories; - private PresetFolder presetsRootFolder; - private PresetFolder selectedFolder; - private ConversionPreset selectedPreset; + private PresetFolderNode presetsRootFolder; + private PresetFolderNode selectedFolder; + private PresetNode selectedPreset; private Settings settings; private bool displaySeeChangeLogLink = true; @@ -65,8 +65,7 @@ namespace FileConverter.ViewModels { // Code runs in Blend --> create design time data. this.Settings = new Settings(); - this.Settings.ConversionPresets.Add(new ConversionPreset("Test", null, OutputType.Mp3)); - this.SelectedPreset = new ConversionPreset("Test", null, OutputType.Mp3); + this.Settings.ConversionPresets.Add(new ConversionPreset("Test", OutputType.Mp3)); } else { @@ -112,7 +111,7 @@ namespace FileConverter.ViewModels for (int index = 0; index < this.inputCategories.Length; index++) { InputExtensionCategory category = this.inputCategories[index]; - if (this.SelectedPreset == null || Helpers.IsOutputTypeCompatibleWithCategory(this.SelectedPreset.OutputType, category.Name)) + if (this.SelectedPreset == null || Helpers.IsOutputTypeCompatibleWithCategory(this.SelectedPreset.Preset.OutputType, category.Name)) { yield return category; } @@ -127,7 +126,7 @@ namespace FileConverter.ViewModels InputPostConversionAction.Delete, }; - public PresetFolder PresetsRootFolder + public PresetFolderNode PresetsRootFolder { get => this.presetsRootFolder; @@ -138,7 +137,7 @@ namespace FileConverter.ViewModels } } - public ObservableObject SelectedItem + public AbstractTreeNode SelectedItem { get { @@ -152,12 +151,12 @@ namespace FileConverter.ViewModels set { - if (value is ConversionPreset preset) + if (value is PresetNode preset) { this.SelectedPreset = preset; this.SelectedFolder = null; } - else if (value is PresetFolder folder) + else if (value is PresetFolderNode folder) { this.SelectedFolder = folder; this.SelectedPreset = null; @@ -172,7 +171,7 @@ namespace FileConverter.ViewModels } } - public PresetFolder SelectedFolder + public PresetFolderNode SelectedFolder { get => this.selectedFolder; @@ -188,7 +187,7 @@ namespace FileConverter.ViewModels } } - public ConversionPreset SelectedPreset + public PresetNode SelectedPreset { get => this.selectedPreset; @@ -196,14 +195,14 @@ namespace FileConverter.ViewModels { if (this.selectedPreset != null) { - this.selectedPreset.PropertyChanged -= this.SelectedPresetPropertyChanged; + this.selectedPreset.Preset.PropertyChanged -= this.SelectedPresetPropertyChanged; } this.selectedPreset = value; if (this.selectedPreset != null) { - this.selectedPreset.PropertyChanged += this.SelectedPresetPropertyChanged; + this.selectedPreset.Preset.PropertyChanged += this.SelectedPresetPropertyChanged; } this.RaisePropertyChanged(); @@ -380,15 +379,15 @@ namespace FileConverter.ViewModels public TreeViewSelectionBehavior.IsChildOfPredicate PresetsHierarchyPredicate => (object nodeA, object nodeB) => { - if (nodeA is ConversionPreset) + if (nodeA is PresetNode) { return false; } - PresetFolder parentFolder = nodeA as PresetFolder; + PresetFolderNode parentFolder = nodeA as PresetFolderNode; Diagnostics.Debug.Assert(parentFolder != null, "Node should be a preset folder."); - return parentFolder.IsNodeInHierarchy(nodeB as ObservableObject, true); + return parentFolder.IsNodeInHierarchy(nodeB as AbstractTreeNode, true); }; private void SelectedPresetPropertyChanged(object sender, PropertyChangedEventArgs eventArgs) @@ -447,28 +446,54 @@ namespace FileConverter.ViewModels private void InitializePresetFolders() { - this.presetsRootFolder = new PresetFolder(null, null); + this.presetsRootFolder = new PresetFolderNode(null, null); foreach (ConversionPreset preset in this.Settings.ConversionPresets) { - PresetFolder folder = this.presetsRootFolder; + PresetFolderNode parent = this.presetsRootFolder; foreach (string folderName in preset.ParentFoldersNames) { - PresetFolder subFolder = folder.Children.FirstOrDefault(match => match is PresetFolder && ((PresetFolder)match).Name == folderName) as PresetFolder; + PresetFolderNode subFolder = parent.Children.FirstOrDefault(match => match is PresetFolderNode && ((PresetFolderNode)match).Name == folderName) as PresetFolderNode; if (subFolder == null) { - subFolder = new PresetFolder(folderName, folder.FoldersNames); - folder.Children.Add(subFolder); + subFolder = new PresetFolderNode(folderName, parent); + parent.Children.Add(subFolder); } - folder = subFolder; + parent = subFolder; } - folder.Children.Add(preset); + PresetNode presetNode = new PresetNode(preset, parent); + parent.Children.Add(presetNode); } this.RaisePropertyChanged(nameof(this.PresetsRootFolder)); } + private void ComputePresetsParentFoldersNames(AbstractTreeNode node, List folderNamesCache) + { + if (node is PresetFolderNode folder) + { + if (!string.IsNullOrEmpty(folder.Name)) + { + folderNamesCache.Add(folder.Name); + } + + foreach (var child in folder.Children) + { + this.ComputePresetsParentFoldersNames(child, folderNamesCache); + } + + if (!string.IsNullOrEmpty(folder.Name)) + { + folderNamesCache.RemoveAt(folderNamesCache.Count - 1); + } + } + else if (node is PresetNode preset) + { + preset.Preset.ParentFoldersNames = folderNamesCache.ToArray(); + } + } + private void CloseSettings(CancelEventArgs args) { ISettingsService settingsService = SimpleIoc.Default.GetInstance(); @@ -485,6 +510,9 @@ namespace FileConverter.ViewModels private void SaveSettings() { + // Compute parent folder names. + this.ComputePresetsParentFoldersNames(this.presetsRootFolder, new List()); + // Save changes. ISettingsService settingsService = SimpleIoc.Default.GetInstance(); settingsService.SaveSettings(); @@ -495,14 +523,18 @@ namespace FileConverter.ViewModels private void CreateFolder() { - PresetFolder parent; + PresetFolderNode parent; if (this.SelectedFolder != null) { parent = this.SelectedFolder; } + else if (this.SelectedItem != null) + { + parent = this.SelectedItem.Parent; + } else { - parent = this.GetSelectedItemParentFolder(); + parent = this.presetsRootFolder; } int insertIndex = parent.Children.IndexOf(this.SelectedItem) + 1; @@ -514,13 +546,13 @@ namespace FileConverter.ViewModels // Generate a unique folder name. string folderName = Properties.Resources.DefaultFolderName; int index = 1; - while (parent.Children.Any(match => match is PresetFolder folder && folder.Name == folderName)) + while (parent.Children.Any(match => match is PresetFolderNode folder && folder.Name == folderName)) { index++; folderName = $"{Properties.Resources.DefaultFolderName} ({index})"; } - PresetFolder newFolder = new PresetFolder(folderName, parent.FoldersNames); + PresetFolderNode newFolder = new PresetFolderNode(folderName, parent); parent.Children.Insert(insertIndex, newFolder); @@ -531,52 +563,129 @@ namespace FileConverter.ViewModels private bool CanMoveSelectedPresetUp() { - PresetFolder parent = this.GetSelectedItemParentFolder(); + if (this.SelectedItem == null) + { + // no preset selected. + return false; + } - int indexOfSelectedPreset = parent.Children.IndexOf(this.SelectedItem); + if (this.SelectedItem.Parent != this.presetsRootFolder) + { + // The parent is not the root, we can move the preset up. + return true; + } + + int indexOfSelectedPreset = this.SelectedItem.Parent.Children.IndexOf(this.SelectedItem); return indexOfSelectedPreset > 0; } private void MoveSelectedPresetUp() { - PresetFolder parent = this.GetSelectedItemParentFolder(); + Diagnostics.Debug.Assert(this.SelectedItem != null, "this.SelectedItem != null"); - int indexOfSelectedPreset = parent.Children.IndexOf(this.SelectedItem); - int newIndexOfSelectedPreset = System.Math.Max(0, indexOfSelectedPreset - 1); + AbstractTreeNode itemToMoveUp = this.SelectedItem; + PresetFolderNode currentParent = itemToMoveUp.Parent; + int indexOfSelectedPreset = currentParent.Children.IndexOf(itemToMoveUp); + if (indexOfSelectedPreset == 0) + { + // Move to the parent folder. + int indexOfFolder = currentParent.Parent.Children.IndexOf(currentParent); + currentParent.Children.RemoveAt(indexOfSelectedPreset); + currentParent.Parent.Children.Insert(indexOfFolder, itemToMoveUp); + itemToMoveUp.Parent = currentParent.Parent; + } + else + { + int newIndexOfSelectedPreset = System.Math.Max(0, indexOfSelectedPreset - 1); + if (currentParent.Children[newIndexOfSelectedPreset] is PresetFolderNode newParent) + { + // Move to child folder. + currentParent.Children.RemoveAt(indexOfSelectedPreset); + newParent.Children.Add(itemToMoveUp); + itemToMoveUp.Parent = newParent; + } + else + { + // Swap nodes. + currentParent.Children.Move(indexOfSelectedPreset, newIndexOfSelectedPreset); + } + } - parent.Children.Move(indexOfSelectedPreset, newIndexOfSelectedPreset); + this.SelectedItem = itemToMoveUp; this.movePresetUpCommand?.RaiseCanExecuteChanged(); this.movePresetDownCommand?.RaiseCanExecuteChanged(); } private bool CanMoveSelectedPresetDown() { - PresetFolder parent = this.GetSelectedItemParentFolder(); - int indexOfSelectedPreset = parent.Children.IndexOf(this.SelectedItem); - return indexOfSelectedPreset < parent.Children.Count - 1; + if (this.SelectedItem == null) + { + // no preset selected. + return false; + } + + if (this.SelectedItem.Parent != this.presetsRootFolder) + { + // The parent is not the root, we can move the preset down. + return true; + } + + int indexOfSelectedPreset = this.SelectedItem.Parent.Children.IndexOf(this.SelectedItem); + return indexOfSelectedPreset < this.SelectedItem.Parent.Children.Count - 1; } private void MoveSelectedPresetDown() { - PresetFolder parent = this.GetSelectedItemParentFolder(); - int indexOfSelectedPreset = parent.Children.IndexOf(this.SelectedItem); - int newIndexOfSelectedPreset = System.Math.Min(parent.Children.Count - 1, indexOfSelectedPreset + 1); + Diagnostics.Debug.Assert(this.SelectedItem != null, "this.SelectedItem != null"); + + AbstractTreeNode itemToMoveDown = this.SelectedItem; + PresetFolderNode currentParent = itemToMoveDown.Parent; + int indexOfSelectedPreset = currentParent.Children.IndexOf(itemToMoveDown); + if (indexOfSelectedPreset == currentParent.Children.Count - 1) + { + // Move to the parent folder. + int indexOfFolder = currentParent.Parent.Children.IndexOf(currentParent); + currentParent.Children.RemoveAt(indexOfSelectedPreset); + currentParent.Parent.Children.Insert(indexOfFolder + 1, itemToMoveDown); + itemToMoveDown.Parent = currentParent.Parent; + } + else + { + int newIndexOfSelectedPreset = System.Math.Min(this.SelectedItem.Parent.Children.Count - 1, indexOfSelectedPreset + 1); + if (currentParent.Children[newIndexOfSelectedPreset] is PresetFolderNode newParent) + { + // Move to child folder. + currentParent.Children.RemoveAt(indexOfSelectedPreset); + newParent.Children.Insert(0, itemToMoveDown); + itemToMoveDown.Parent = newParent; + } + else + { + // Swap nodes. + currentParent.Children.Move(indexOfSelectedPreset, newIndexOfSelectedPreset); + } + } + + this.SelectedItem = itemToMoveDown; - parent.Children.Move(indexOfSelectedPreset, newIndexOfSelectedPreset); this.movePresetUpCommand?.RaiseCanExecuteChanged(); this.movePresetDownCommand?.RaiseCanExecuteChanged(); } private void AddNewPreset() { - PresetFolder parent; + PresetFolderNode parent; if (this.SelectedFolder != null) { parent = this.SelectedFolder; } + else if (this.SelectedItem != null) + { + parent = this.SelectedItem.Parent; + } else { - parent = this.GetSelectedItemParentFolder(); + parent = this.presetsRootFolder; } int insertIndex = parent.Children.IndexOf(this.SelectedItem) + 1; @@ -588,7 +697,7 @@ namespace FileConverter.ViewModels // Generate a unique preset name. string presetName = Properties.Resources.DefaultPresetName; int index = 1; - while (parent.Children.Any(match => match is ConversionPreset folder && folder.ShortName == presetName)) + while (parent.Children.Any(match => match is PresetNode folder && folder.Preset.ShortName == presetName)) { index++; presetName = $"{Properties.Resources.DefaultPresetName} ({index})"; @@ -598,16 +707,18 @@ namespace FileConverter.ViewModels ConversionPreset newPreset = null; if (this.SelectedPreset != null) { - newPreset = new ConversionPreset(presetName, this.SelectedPreset); + newPreset = new ConversionPreset(presetName, this.SelectedPreset.Preset); } else { - newPreset = new ConversionPreset(presetName, parent.FoldersNames, OutputType.Mkv, new string[0]); + newPreset = new ConversionPreset(presetName, OutputType.Mkv, new string[0]); } - parent.Children.Insert(insertIndex, newPreset); + PresetNode node = new PresetNode(newPreset, parent); - this.SelectedItem = newPreset; + parent.Children.Insert(insertIndex, node); + + this.SelectedItem = node; Messenger.Default.Send("PresetName", "DoFocus"); @@ -616,8 +727,7 @@ namespace FileConverter.ViewModels private void RemoveSelectedPreset() { - PresetFolder parent = this.GetSelectedItemParentFolder(); - parent.Children.Remove(this.SelectedItem); + this.SelectedItem.Parent.Children.Remove(this.SelectedItem); this.SelectedItem = null; @@ -628,30 +738,5 @@ namespace FileConverter.ViewModels { return this.SelectedItem != null; } - - private PresetFolder GetSelectedItemParentFolder() - { - PresetFolder parent = this.PresetsRootFolder; - if (this.SelectedPreset != null) - { - foreach (string folderName in this.SelectedPreset.ParentFoldersNames) - { - parent = parent.Children.First(match => match is PresetFolder folder && folder.Name == folderName) as PresetFolder; - } - } - else if (this.SelectedFolder != null) - { - string[] parentFolderNames = this.SelectedFolder.ParentFoldersNames; - if (parentFolderNames != null) - { - foreach (string folderName in parentFolderNames) - { - parent = parent.Children.First(match => match is PresetFolder folder && folder.Name == folderName) as PresetFolder; - } - } - } - - return parent; - } } } diff --git a/Application/FileConverter/Views/SettingsWindow.xaml b/Application/FileConverter/Views/SettingsWindow.xaml index 7ff0f5c..e0f2ca9 100644 --- a/Application/FileConverter/Views/SettingsWindow.xaml +++ b/Application/FileConverter/Views/SettingsWindow.xaml @@ -86,7 +86,7 @@ - + @@ -94,8 +94,8 @@ - - + + @@ -137,9 +137,8 @@ - + Visibility="{Binding SelectedFolder, Converter={StaticResource ReferenceToVisibility}}"> + @@ -170,7 +169,7 @@