From ac91c536dd4c97d8622f42b7e53b73ca3810be61 Mon Sep 17 00:00:00 2001
From: Oleksii Holub <Oleksii.Holub@3shape.com>
Date: Wed, 5 Dec 2018 18:20:20 +0200
Subject: [PATCH] Improve ExportSetupView UI

---
 .../Views/Dialogs/ExportSetupView.xaml        | 46 +++++++++++++++++--
 DiscordChatExporter.Gui/Views/RootView.xaml   |  3 +-
 2 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/DiscordChatExporter.Gui/Views/Dialogs/ExportSetupView.xaml b/DiscordChatExporter.Gui/Views/Dialogs/ExportSetupView.xaml
index 3348b87..76eb390 100644
--- a/DiscordChatExporter.Gui/Views/Dialogs/ExportSetupView.xaml
+++ b/DiscordChatExporter.Gui/Views/Dialogs/ExportSetupView.xaml
@@ -8,7 +8,7 @@
     xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:s="https://github.com/canton7/Stylet"
-    MinWidth="325"
+    Width="375"
     d:DataContext="{d:DesignInstance Type=dialogs:ExportSetupViewModel}"
     SnapsToDevicePixels="True"
     TextElement.FontSize="13"
@@ -18,9 +18,45 @@
     TextOptions.TextRenderingMode="Auto"
     mc:Ignorable="d">
     <StackPanel>
+        <!--  Guild/channel info  -->
+        <Grid Margin="8,16">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
+
+            <!--  Guild icon  -->
+            <Ellipse
+                Grid.Column="0"
+                Width="32"
+                Height="32">
+                <Ellipse.Fill>
+                    <ImageBrush ImageSource="{Binding Guild.IconUrl}" />
+                </Ellipse.Fill>
+            </Ellipse>
+
+            <!--  Guild and channel name  -->
+            <TextBlock
+                Grid.Column="1"
+                Margin="8,0,0,0"
+                VerticalAlignment="Center"
+                FontSize="17"
+                TextTrimming="CharacterEllipsis">
+                <Run
+                    Foreground="{DynamicResource SecondaryTextBrush}"
+                    Text="{Binding Guild.Name, Mode=OneWay}"
+                    ToolTip="{Binding Guild.Name, Mode=OneWay}" />
+                <Run Text="/" />
+                <Run
+                    Foreground="{DynamicResource PrimaryTextBrush}"
+                    Text="{Binding Channel.Name, Mode=OneWay}"
+                    ToolTip="{Binding Channel.Name, Mode=OneWay}" />
+            </TextBlock>
+        </Grid>
+
         <!--  Format  -->
         <ComboBox
-            Margin="16,16,16,8"
+            Margin="8"
             materialDesign:HintAssist.Hint="Export format"
             materialDesign:HintAssist.IsFloating="True"
             IsReadOnly="True"
@@ -42,7 +78,7 @@
             <DatePicker
                 Grid.Row="0"
                 Grid.Column="0"
-                Margin="16,20,8,8"
+                Margin="8"
                 materialDesign:HintAssist.Hint="From (optional)"
                 materialDesign:HintAssist.IsFloating="True"
                 DisplayDateEnd="{Binding To}"
@@ -50,7 +86,7 @@
             <DatePicker
                 Grid.Row="0"
                 Grid.Column="1"
-                Margin="8,20,16,8"
+                Margin="8"
                 materialDesign:HintAssist.Hint="To (optional)"
                 materialDesign:HintAssist.IsFloating="True"
                 DisplayDateStart="{Binding From}"
@@ -59,7 +95,7 @@
 
         <!--  Partitioning  -->
         <TextBox
-            Margin="16,8,16,8"
+            Margin="8"
             materialDesign:HintAssist.Hint="Messages per partition (optional)"
             materialDesign:HintAssist.IsFloating="True"
             Text="{Binding PartitionLimit, TargetNullValue=''}" />
diff --git a/DiscordChatExporter.Gui/Views/RootView.xaml b/DiscordChatExporter.Gui/Views/RootView.xaml
index 6909fa7..10fab6c 100644
--- a/DiscordChatExporter.Gui/Views/RootView.xaml
+++ b/DiscordChatExporter.Gui/Views/RootView.xaml
@@ -24,7 +24,7 @@
     UseLayoutRounding="True"
     WindowStartupLocation="CenterScreen"
     mc:Ignorable="d">
-    <materialDesign:DialogHost SnackbarMessageQueue="{Binding Notifications}">
+    <materialDesign:DialogHost CloseOnClickAway="True" SnackbarMessageQueue="{Binding Notifications}">
         <DockPanel>
             <!--  Toolbar  -->
             <Border
@@ -189,7 +189,6 @@
                                             Orientation="Horizontal">
                                             <StackPanel.InputBindings>
                                                 <MouseBinding
-                                                    s:View.ActionTarget="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}"
                                                     Command="{s:Action ExportChannel}"
                                                     CommandParameter="{Binding}"
                                                     MouseAction="LeftClick" />