From 60603dfb04817def05fe10ea3731cdc4c831e5cf Mon Sep 17 00:00:00 2001
From: Tyrrrz <1935960+Tyrrrz@users.noreply.github.com>
Date: Tue, 14 Feb 2023 17:04:30 +0200
Subject: [PATCH] Improve output path picker in GUI

---
 .../Discord/DiscordClient.cs                  |  3 +-
 .../Views/Dialogs/ExportSetupView.xaml        | 34 +++++--------------
 2 files changed, 11 insertions(+), 26 deletions(-)

diff --git a/DiscordChatExporter.Core/Discord/DiscordClient.cs b/DiscordChatExporter.Core/Discord/DiscordClient.cs
index 2585bca..ef7b946 100644
--- a/DiscordChatExporter.Core/Discord/DiscordClient.cs
+++ b/DiscordChatExporter.Core/Discord/DiscordClient.cs
@@ -66,7 +66,8 @@ public class DiscordClient
             var resetAfterDelay = response
                 .Headers
                 .TryGetValue("X-RateLimit-Reset-After")?
-                .Pipe(s => TimeSpan.FromSeconds(double.Parse(s, CultureInfo.InvariantCulture)));
+                .Pipe(s => double.Parse(s, CultureInfo.InvariantCulture))
+                .Pipe(TimeSpan.FromSeconds);
 
             if (remainingRequestCount <= 0 && resetAfterDelay is not null)
             {
diff --git a/DiscordChatExporter.Gui/Views/Dialogs/ExportSetupView.xaml b/DiscordChatExporter.Gui/Views/Dialogs/ExportSetupView.xaml
index 0267697..8566229 100644
--- a/DiscordChatExporter.Gui/Views/Dialogs/ExportSetupView.xaml
+++ b/DiscordChatExporter.Gui/Views/Dialogs/ExportSetupView.xaml
@@ -77,14 +77,9 @@
             <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
                 <StackPanel>
                     <!--  Output path  -->
-                    <Grid>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="*" />
-                            <ColumnDefinition Width="Auto" />
-                        </Grid.ColumnDefinitions>
+                    <Grid Margin="16,8">
                         <TextBox
-                            Grid.Column="0"
-                            Margin="16,8,8,8"
+                            Padding="16,16,42,16"
                             materialDesign:HintAssist.Hint="Output path"
                             materialDesign:HintAssist.IsFloating="True"
                             Style="{DynamicResource MaterialDesignOutlinedTextBox}"
@@ -134,25 +129,14 @@
                             </TextBox.ToolTip>
                         </TextBox>
                         <Button
-                            Grid.Column="1"
-                            Height="48"
-                            Margin="0,8,16,8"
+                            Width="24"
+                            Height="24"
+                            Margin="0,0,12,0"
+                            Padding="0"
+                            HorizontalAlignment="Right"
                             Command="{s:Action ShowOutputPathPrompt}"
-                            Style="{DynamicResource MaterialDesignOutlinedButton}">
-                            <materialDesign:PackIcon Width="24" Height="24">
-                                <materialDesign:PackIcon.Style>
-                                    <Style TargetType="{x:Type materialDesign:PackIcon}">
-                                        <Style.Triggers>
-                                            <DataTrigger Binding="{Binding IsSingleChannel}" Value="True">
-                                                <Setter Property="Kind" Value="FileFind" />
-                                            </DataTrigger>
-                                            <DataTrigger Binding="{Binding IsSingleChannel}" Value="False">
-                                                <Setter Property="Kind" Value="FolderSearch" />
-                                            </DataTrigger>
-                                        </Style.Triggers>
-                                    </Style>
-                                </materialDesign:PackIcon.Style>
-                            </materialDesign:PackIcon>
+                            Style="{DynamicResource MaterialDesignToolForegroundButton}">
+                            <materialDesign:PackIcon Kind="FolderOpen" />
                         </Button>
                     </Grid>