From 5846129cc61c420c69b49c93e7544f4b4439e195 Mon Sep 17 00:00:00 2001
From: Tyrrrz <1935960+Tyrrrz@users.noreply.github.com>
Date: Tue, 14 Nov 2023 23:44:17 +0200
Subject: [PATCH] Use native `OpenFolderDialog` in GUI
---
DiscordChatExporter.Gui/DiscordChatExporter.Gui.csproj | 1 -
.../ViewModels/Framework/DialogManager.cs | 6 ++----
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/DiscordChatExporter.Gui/DiscordChatExporter.Gui.csproj b/DiscordChatExporter.Gui/DiscordChatExporter.Gui.csproj
index 416c8a2..c686497 100644
--- a/DiscordChatExporter.Gui/DiscordChatExporter.Gui.csproj
+++ b/DiscordChatExporter.Gui/DiscordChatExporter.Gui.csproj
@@ -21,7 +21,6 @@
-
diff --git a/DiscordChatExporter.Gui/ViewModels/Framework/DialogManager.cs b/DiscordChatExporter.Gui/ViewModels/Framework/DialogManager.cs
index b4038dc..c4b76fa 100644
--- a/DiscordChatExporter.Gui/ViewModels/Framework/DialogManager.cs
+++ b/DiscordChatExporter.Gui/ViewModels/Framework/DialogManager.cs
@@ -4,7 +4,6 @@ using System.Threading;
using System.Threading.Tasks;
using MaterialDesignThemes.Wpf;
using Microsoft.Win32;
-using Ookii.Dialogs.Wpf;
using Stylet;
namespace DiscordChatExporter.Gui.ViewModels.Framework;
@@ -68,9 +67,8 @@ public class DialogManager : IDisposable
public string? PromptDirectoryPath(string defaultDirPath = "")
{
- var dialog = new VistaFolderBrowserDialog { SelectedPath = defaultDirPath };
-
- return dialog.ShowDialog() == true ? dialog.SelectedPath : null;
+ var dialog = new OpenFolderDialog { InitialDirectory = defaultDirPath };
+ return dialog.ShowDialog() == true ? dialog.FolderName : null;
}
public void Dispose()