Merge pull request #187 from OliBomby/iptq/export-dialog-directory

Make export dialogs start at the same directory as the import path
OliBomby · Dec 21, 2022 · 31548a0 · 31548a0
2 parents 798aa3c + 9c47fda
commit 31548a0
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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);
                     }
                 });