[GUI] Fix outdated binding

3 years ago · 720e53caab
parent da9536bd1b
commit 720e53caab
1 changed files with 56 additions and 56 deletions
--- a/DiscordChatExporter.Gui/Views/Dialogs/ExportSetupView.xaml
+++ b/DiscordChatExporter.Gui/Views/Dialogs/ExportSetupView.xaml
@ -1,17 +1,17 @@
 <UserControl
+    Style="{DynamicResource MaterialDesignRoot}"
+    Width="380"
+    d:DataContext="{d:DesignInstance Type=dialogs:ExportSetupViewModel}"
+    mc:Ignorable="d"
    x:Class="DiscordChatExporter.Gui.Views.Dialogs.ExportSetupView"
    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
    xmlns:converters="clr-namespace:DiscordChatExporter.Gui.Converters"
    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
    xmlns:dialogs="clr-namespace:DiscordChatExporter.Gui.ViewModels.Dialogs"
    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
    xmlns:s="https://github.com/canton7/Stylet"
-    Width="380"
-    d:DataContext="{d:DesignInstance Type=dialogs:ExportSetupViewModel}"
-    Style="{DynamicResource MaterialDesignRoot}"
-    mc:Ignorable="d">
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
    <StackPanel>
        <!--  Guild/channel info  -->
        <Grid Margin="16">
@ -23,8 +23,8 @@
            <!--  Guild icon  -->
            <Ellipse
                Grid.Column="0"
-                Width="32"
-                Height="32">
+                Height="32"
+                Width="32">
                <Ellipse.Fill>
                    <ImageBrush ImageSource="{Binding Guild.IconUrl}" />
                </Ellipse.Fill>
@ -32,11 +32,11 @@

            <!--  Placeholder (for multiple channels)  -->
            <TextBlock
+                FontSize="19"
                Grid.Column="1"
                Margin="8,0,0,0"
-                VerticalAlignment="Center"
-                FontSize="19"
                TextTrimming="CharacterEllipsis"
+                VerticalAlignment="Center"
                Visibility="{Binding IsSingleChannel, Converter={x:Static s:BoolToVisibilityConverter.InverseInstance}}">
                <Run Text="{Binding Channels.Count, Mode=OneWay}" />
                <Run Text="channels selected" />
@ -44,14 +44,14 @@

            <!--  Category and channel name (for single channel)  -->
            <TextBlock
-                Grid.Column="1"
-                Margin="8,0,0,0"
-                VerticalAlignment="Center"
                FontSize="19"
                FontWeight="Light"
+                Grid.Column="1"
+                Margin="8,0,0,0"
                TextTrimming="CharacterEllipsis"
+                VerticalAlignment="Center"
                Visibility="{Binding IsSingleChannel, Converter={x:Static s:BoolToVisibilityConverter.Instance}}">
-                <Run Text="{Binding Channels[0].Category, Mode=OneWay}" ToolTip="{Binding Channels[0].Category, Mode=OneWay}" />
+                <Run Text="{Binding Channels[0].Category.Name, Mode=OneWay}" ToolTip="{Binding Channels[0].Category.Name, Mode=OneWay}" />
                <Run Text="/" />
                <Run
                    FontWeight="SemiBold"
@ -62,12 +62,12 @@

        <!--  Format  -->
        <ComboBox
-            Margin="16,8"
-            materialDesign:HintAssist.Hint="Format"
-            materialDesign:HintAssist.IsFloating="True"
            IsReadOnly="True"
            ItemsSource="{Binding AvailableFormats}"
-            SelectedItem="{Binding SelectedFormat}">
+            Margin="16,8"
+            SelectedItem="{Binding SelectedFormat}"
+            materialDesign:HintAssist.Hint="Format"
+            materialDesign:HintAssist.IsFloating="True">
            <ComboBox.ItemTemplate>
                <DataTemplate>
                    <TextBlock Text="{Binding Converter={x:Static converters:ExportFormatToStringConverter.Instance}}" />
@ -88,58 +88,58 @@
                    <RowDefinition Height="*" />
                </Grid.RowDefinitions>
                <DatePicker
-                    Grid.Row="0"
+                    DisplayDateEnd="{Binding BeforeDate, Converter={x:Static converters:DateTimeOffsetToDateTimeConverter.Instance}}"
                    Grid.Column="0"
+                    Grid.Row="0"
                    Margin="16,8,16,4"
-                    materialDesign:HintAssist.Hint="After (date)"
-                    materialDesign:HintAssist.IsFloating="True"
-                    DisplayDateEnd="{Binding BeforeDate, Converter={x:Static converters:DateTimeOffsetToDateTimeConverter.Instance}}"
                    SelectedDate="{Binding AfterDate, Converter={x:Static converters:DateTimeOffsetToDateTimeConverter.Instance}}"
-                    ToolTip="Only include messages sent after this date" />
+                    ToolTip="Only include messages sent after this date"
+                    materialDesign:HintAssist.Hint="After (date)"
+                    materialDesign:HintAssist.IsFloating="True" />
                <DatePicker
-                    Grid.Row="0"
+                    DisplayDateStart="{Binding AfterDate, Converter={x:Static converters:DateTimeOffsetToDateTimeConverter.Instance}}"
                    Grid.Column="1"
+                    Grid.Row="0"
                    Margin="16,8,16,4"
-                    materialDesign:HintAssist.Hint="Before (date)"
-                    materialDesign:HintAssist.IsFloating="True"
-                    DisplayDateStart="{Binding AfterDate, Converter={x:Static converters:DateTimeOffsetToDateTimeConverter.Instance}}"
                    SelectedDate="{Binding BeforeDate, Converter={x:Static converters:DateTimeOffsetToDateTimeConverter.Instance}}"
-                    ToolTip="Only include messages sent before this date" />
+                    ToolTip="Only include messages sent before this date"
+                    materialDesign:HintAssist.Hint="Before (date)"
+                    materialDesign:HintAssist.IsFloating="True" />
                <materialDesign:TimePicker
-                    Grid.Row="1"
                    Grid.Column="0"
-                    Margin="16,4,16,8"
-                    materialDesign:HintAssist.Hint="After (time)"
-                    materialDesign:HintAssist.IsFloating="True"
+                    Grid.Row="1"
                    IsEnabled="{Binding IsAfterDateSet}"
+                    Margin="16,4,16,8"
                    SelectedTime="{Binding AfterTime, Converter={x:Static converters:TimeSpanToDateTimeConverter.Instance}}"
-                    ToolTip="Only include messages sent after this time" />
+                    ToolTip="Only include messages sent after this time"
+                    materialDesign:HintAssist.Hint="After (time)"
+                    materialDesign:HintAssist.IsFloating="True" />
                <materialDesign:TimePicker
-                    Grid.Row="1"
                    Grid.Column="1"
-                    Margin="16,4,16,8"
-                    materialDesign:HintAssist.Hint="Before (time)"
-                    materialDesign:HintAssist.IsFloating="True"
+                    Grid.Row="1"
                    IsEnabled="{Binding IsBeforeDateSet}"
+                    Margin="16,4,16,8"
                    SelectedTime="{Binding BeforeTime, Converter={x:Static converters:TimeSpanToDateTimeConverter.Instance}}"
-                    ToolTip="Only include messages sent before this time" />
+                    ToolTip="Only include messages sent before this time"
+                    materialDesign:HintAssist.Hint="Before (time)"
+                    materialDesign:HintAssist.IsFloating="True" />
            </Grid>

            <!--  Partitioning  -->
            <TextBox
                Margin="16,8"
-                materialDesign:HintAssist.Hint="Partition limit"
-                materialDesign:HintAssist.IsFloating="True"
                Text="{Binding PartitionLimitValue}"
-                ToolTip="Split output into partitions, each limited to this number of messages (e.g. '100') or file size (e.g. '10mb')" />
+                ToolTip="Split output into partitions, each limited to this number of messages (e.g. '100') or file size (e.g. '10mb')"
+                materialDesign:HintAssist.Hint="Partition limit"
+                materialDesign:HintAssist.IsFloating="True" />

            <!--  Filtering  -->
            <TextBox
                Margin="16,8"
-                materialDesign:HintAssist.Hint="Message filter"
-                materialDesign:HintAssist.IsFloating="True"
                Text="{Binding MessageFilterValue}"
-                ToolTip="Only include messages that satisfy this filter (e.g. 'from:foo#1234' or 'has:image')." />
+                ToolTip="Only include messages that satisfy this filter (e.g. 'from:foo#1234' or 'has:image')."
+                materialDesign:HintAssist.Hint="Message filter"
+                materialDesign:HintAssist.IsFloating="True" />

            <!--  Download media  -->
            <Grid Margin="16,16" ToolTip="Download referenced media content (user avatars, attached files, embedded images, etc)">
@ -150,13 +150,13 @@

                <TextBlock
                    Grid.Column="0"
-                    VerticalAlignment="Center"
-                    Text="Download media" />
+                    Text="Download media"
+                    VerticalAlignment="Center" />
                <ToggleButton
                    Grid.Column="1"
                    HorizontalAlignment="Right"
-                    VerticalAlignment="Center"
-                    IsChecked="{Binding ShouldDownloadMedia}" />
+                    IsChecked="{Binding ShouldDownloadMedia}"
+                    VerticalAlignment="Center" />
            </Grid>
        </StackPanel>

@ -170,29 +170,29 @@
            </Grid.ColumnDefinitions>

            <ToggleButton
-                x:Name="AdvancedSectionToggleButton"
+                Cursor="Hand"
                Grid.Column="0"
-                Width="24"
                Height="24"
-                Margin="12"
-                Cursor="Hand"
                IsChecked="{Binding IsAdvancedSectionDisplayedByDefault, Mode=OneTime}"
+                Margin="12"
                Style="{DynamicResource MaterialDesignHamburgerToggleButton}"
-                ToolTip="Toggle advanced options" />
+                ToolTip="Toggle advanced options"
+                Width="24"
+                x:Name="AdvancedSectionToggleButton" />

            <Button
-                Grid.Column="2"
-                Margin="8"
                Command="{s:Action Confirm}"
                Content="EXPORT"
+                Grid.Column="2"
                IsDefault="True"
+                Margin="8"
                Style="{DynamicResource MaterialDesignFlatButton}" />
            <Button
-                Grid.Column="3"
-                Margin="8"
                Command="{s:Action Close}"
                Content="CANCEL"
+                Grid.Column="3"
                IsCancel="True"
+                Margin="8"
                Style="{DynamicResource MaterialDesignFlatButton}" />
        </Grid>
    </StackPanel>