From 0d07bd091303a28ae0bd529a16bd52754c54b1f8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 8 Dec 2022 15:27:39 +0000 Subject: [PATCH 1/3] Bump Newtonsoft.Json from 13.0.1 to 13.0.2 in /Mapping_Tools Bumps [Newtonsoft.Json](https://github.com/JamesNK/Newtonsoft.Json) from 13.0.1 to 13.0.2. - [Release notes](https://github.com/JamesNK/Newtonsoft.Json/releases) - [Commits](https://github.com/JamesNK/Newtonsoft.Json/compare/13.0.1...13.0.2) --- updated-dependencies: - dependency-name: Newtonsoft.Json dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- Mapping_Tools/Mapping_Tools.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mapping_Tools/Mapping_Tools.csproj b/Mapping_Tools/Mapping_Tools.csproj index b7868f90..26554ac2 100644 --- a/Mapping_Tools/Mapping_Tools.csproj +++ b/Mapping_Tools/Mapping_Tools.csproj @@ -69,7 +69,7 @@ - + From 1efc77aa217c0a1fb52dc846c7c06ab10bc92e38 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 8 Dec 2022 15:27:39 +0000 Subject: [PATCH 2/3] Bump Newtonsoft.Json from 13.0.1 to 13.0.2 in /Mapping_Tools_Tests Bumps [Newtonsoft.Json](https://github.com/JamesNK/Newtonsoft.Json) from 13.0.1 to 13.0.2. - [Release notes](https://github.com/JamesNK/Newtonsoft.Json/releases) - [Commits](https://github.com/JamesNK/Newtonsoft.Json/compare/13.0.1...13.0.2) --- updated-dependencies: - dependency-name: Newtonsoft.Json dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- Mapping_Tools/Mapping_Tools.csproj | 2 +- Mapping_Tools_Tests/Mapping_Tools_Tests.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Mapping_Tools/Mapping_Tools.csproj b/Mapping_Tools/Mapping_Tools.csproj index b7868f90..26554ac2 100644 --- a/Mapping_Tools/Mapping_Tools.csproj +++ b/Mapping_Tools/Mapping_Tools.csproj @@ -69,7 +69,7 @@ - + diff --git a/Mapping_Tools_Tests/Mapping_Tools_Tests.csproj b/Mapping_Tools_Tests/Mapping_Tools_Tests.csproj index e2f2e5dc..da6e17bb 100644 --- a/Mapping_Tools_Tests/Mapping_Tools_Tests.csproj +++ b/Mapping_Tools_Tests/Mapping_Tools_Tests.csproj @@ -29,6 +29,6 @@ - + \ No newline at end of file From 9c47fda018298b8596cfdbb42854deedc77ab4a8 Mon Sep 17 00:00:00 2001 From: Michael Zhang Date: Sat, 10 Dec 2022 10:45:59 -0600 Subject: [PATCH 3/3] Make export dialogs start at the same directory as the import path --- Mapping_Tools/Viewmodels/HitsoundCopierVM.cs | 5 ++++- Mapping_Tools/Viewmodels/MetadataManagerVM.cs | 5 ++++- Mapping_Tools/Viewmodels/TimingCopierVM.cs | 7 +++++-- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/Mapping_Tools/Viewmodels/HitsoundCopierVM.cs b/Mapping_Tools/Viewmodels/HitsoundCopierVM.cs index 3b6037c7..874cf854 100644 --- a/Mapping_Tools/Viewmodels/HitsoundCopierVM.cs +++ b/Mapping_Tools/Viewmodels/HitsoundCopierVM.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; +using System.IO; using System.Text.Json.Serialization; using Mapping_Tools.Classes; using Mapping_Tools.Classes.BeatmapHelper; @@ -233,7 +234,9 @@ public HitsoundCopierVm() { ExportBrowseCommand = new CommandImplementation( _ => { - string[] paths = IOHelper.BeatmapFileDialog(true, !SettingsManager.Settings.CurrentBeatmapDefaultFolder); + string pathFromDirectory = Directory.GetParent(PathFrom).FullName; + + string[] paths = IOHelper.BeatmapFileDialog(pathFromDirectory, true); if (paths.Length != 0) { PathTo = string.Join("|", paths); } diff --git a/Mapping_Tools/Viewmodels/MetadataManagerVM.cs b/Mapping_Tools/Viewmodels/MetadataManagerVM.cs index d3f75cf0..02eb49ad 100644 --- a/Mapping_Tools/Viewmodels/MetadataManagerVM.cs +++ b/Mapping_Tools/Viewmodels/MetadataManagerVM.cs @@ -2,6 +2,7 @@ using Mapping_Tools.Classes.SystemTools; using Mapping_Tools.Components.Domain; using System; +using System.IO; using System.Collections.Generic; using System.Collections.ObjectModel; using System.ComponentModel; @@ -84,7 +85,9 @@ public MetadataManagerVm() { ExportBrowseCommand = new CommandImplementation( _ => { - var paths = IOHelper.BeatmapFileDialog(true, !SettingsManager.Settings.CurrentBeatmapDefaultFolder); + string importPathDirectory = Directory.GetParent(ImportPath).FullName; + + var paths = IOHelper.BeatmapFileDialog(importPathDirectory, true); if( paths.Length != 0 ) { ExportPath = string.Join("|", paths); } diff --git a/Mapping_Tools/Viewmodels/TimingCopierVM.cs b/Mapping_Tools/Viewmodels/TimingCopierVM.cs index 8f416372..d728cdcf 100644 --- a/Mapping_Tools/Viewmodels/TimingCopierVM.cs +++ b/Mapping_Tools/Viewmodels/TimingCopierVM.cs @@ -1,4 +1,5 @@ using System; +using System.IO; using Mapping_Tools.Classes.SystemTools; using Mapping_Tools.Components.Domain; using System.ComponentModel; @@ -56,8 +57,10 @@ public TimingCopierVm() { ExportBrowseCommand = new CommandImplementation( _ => { - string[] paths = IOHelper.BeatmapFileDialog(true, !SettingsManager.Settings.CurrentBeatmapDefaultFolder); - if( paths.Length != 0 ) { + string importPathDirectory = Directory.GetParent(ImportPath).FullName; + + string[] paths = IOHelper.BeatmapFileDialog(importPathDirectory, true); + if ( paths.Length != 0 ) { ExportPath = string.Join("|", paths); } });