Cleanup GUI

2026-04-28 00:36:00 +00:00 · 2022-04-01 00:10:17 +03:00
parent 3a2b119618
commit 1daff4178d
15 changed files with 254 additions and 201 deletions
--- a/DiscordChatExporter.Gui/Views/Dialogs/ExportSetupView.xaml
+++ b/DiscordChatExporter.Gui/Views/Dialogs/ExportSetupView.xaml
@@ -1,10 +1,7 @@
 <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"
@@ -12,7 +9,10 @@
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
    xmlns:s="https://github.com/canton7/Stylet"
    xmlns:utils="clr-namespace:DiscordChatExporter.Gui.Utils"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    Width="380"
+    d:DataContext="{d:DesignInstance Type=dialogs:ExportSetupViewModel}"
+    Style="{DynamicResource MaterialDesignRoot}"
+    mc:Ignorable="d">
    <Grid>
        <Grid.RowDefinitions>
            <RowDefinition Height="Auto" />
@@ -30,21 +30,21 @@
            <!--  Guild icon  -->
            <Ellipse
                Grid.Column="0"
-                Height="32"
-                Width="32">
+                Width="32"
+                Height="32">
                <Ellipse.Fill>
                    <ImageBrush ImageSource="{Binding Guild.IconUrl}" />
                </Ellipse.Fill>
            </Ellipse>

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

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

        <Border
-            BorderBrush="{DynamicResource MaterialDesignDivider}"
-            BorderThickness="0,1"
            Grid.Row="1"
-            Padding="0,8">
+            Padding="0,8"
+            BorderBrush="{DynamicResource MaterialDesignDivider}"
+            BorderThickness="0,1">
            <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
                <StackPanel>
                    <!--  Format  -->
                    <ComboBox
+                        Margin="16,8"
+                        materialDesign:HintAssist.Hint="Format"
+                        materialDesign:HintAssist.IsFloating="True"
                        IsReadOnly="True"
                        ItemsSource="{Binding AvailableFormats}"
-                        Margin="16,8"
                        SelectedItem="{Binding SelectedFormat}"
-                        Style="{DynamicResource MaterialDesignOutlinedComboBox}"
-                        materialDesign:HintAssist.Hint="Format"
-                        materialDesign:HintAssist.IsFloating="True">
+                        Style="{DynamicResource MaterialDesignOutlinedComboBox}">
                        <ComboBox.ItemTemplate>
                            <DataTemplate>
                                <TextBlock Text="{Binding Converter={x:Static converters:ExportFormatToStringConverter.Instance}}" />
@@ -105,66 +105,66 @@
                                <RowDefinition Height="*" />
                            </Grid.RowDefinitions>
                            <DatePicker
-                                DisplayDateEnd="{Binding BeforeDate, Converter={x:Static converters:DateTimeOffsetToDateTimeConverter.Instance}}"
-                                Grid.Column="0"
                                Grid.Row="0"
+                                Grid.Column="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}}"
                                Style="{DynamicResource MaterialDesignOutlinedDatePicker}"
-                                ToolTip="Only include messages sent after this date"
-                                materialDesign:HintAssist.Hint="After (date)"
-                                materialDesign:HintAssist.IsFloating="True" />
+                                ToolTip="Only include messages sent after this date" />
                            <DatePicker
-                                DisplayDateStart="{Binding AfterDate, Converter={x:Static converters:DateTimeOffsetToDateTimeConverter.Instance}}"
-                                Grid.Column="1"
                                Grid.Row="0"
+                                Grid.Column="1"
                                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}}"
                                Style="{DynamicResource MaterialDesignOutlinedDatePicker}"
-                                ToolTip="Only include messages sent before this date"
-                                materialDesign:HintAssist.Hint="Before (date)"
-                                materialDesign:HintAssist.IsFloating="True" />
+                                ToolTip="Only include messages sent before this date" />
                            <materialDesign:TimePicker
-                                Grid.Column="0"
                                Grid.Row="1"
+                                Grid.Column="0"
+                                Margin="16,4,16,8"
+                                materialDesign:HintAssist.Hint="After (time)"
+                                materialDesign:HintAssist.IsFloating="True"
                                Is24Hours="{x:Static utils:Internationalization.Is24Hours}"
                                IsEnabled="{Binding IsAfterDateSet}"
-                                Margin="16,4,16,8"
                                SelectedTime="{Binding AfterTime, Converter={x:Static converters:TimeSpanToDateTimeConverter.Instance}}"
                                Style="{DynamicResource MaterialDesignOutlinedTimePicker}"
-                                ToolTip="Only include messages sent after this time"
-                                materialDesign:HintAssist.Hint="After (time)"
-                                materialDesign:HintAssist.IsFloating="True" />
+                                ToolTip="Only include messages sent after this time" />
                            <materialDesign:TimePicker
-                                Grid.Column="1"
                                Grid.Row="1"
+                                Grid.Column="1"
+                                Margin="16,4,16,8"
+                                materialDesign:HintAssist.Hint="Before (time)"
+                                materialDesign:HintAssist.IsFloating="True"
                                Is24Hours="{x:Static utils:Internationalization.Is24Hours}"
                                IsEnabled="{Binding IsBeforeDateSet}"
-                                Margin="16,4,16,8"
                                SelectedTime="{Binding BeforeTime, Converter={x:Static converters:TimeSpanToDateTimeConverter.Instance}}"
                                Style="{DynamicResource MaterialDesignOutlinedTimePicker}"
-                                ToolTip="Only include messages sent before this time"
-                                materialDesign:HintAssist.Hint="Before (time)"
-                                materialDesign:HintAssist.IsFloating="True" />
+                                ToolTip="Only include messages sent before this time" />
                        </Grid>

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

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

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

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

            <Button
-                Command="{s:Action ToggleAdvancedSection}"
                Grid.Column="0"
+                Command="{s:Action ToggleAdvancedSection}"
                IsDefault="True"
                ToolTip="Toggle advanced options">
                <Button.Style>
@@ -217,17 +217,17 @@
            </Button>

            <Button
+                Grid.Column="2"
                Command="{s:Action Confirm}"
                Content="EXPORT"
-                Grid.Column="2"
                IsDefault="True"
                Style="{DynamicResource MaterialDesignOutlinedButton}" />
            <Button
+                Grid.Column="3"
+                Margin="8,0,0,0"
                Command="{s:Action Close}"
                Content="CANCEL"
-                Grid.Column="3"
                IsCancel="True"
-                Margin="8,0,0,0"
                Style="{DynamicResource MaterialDesignOutlinedButton}" />
        </Grid>
    </Grid>
--- a/DiscordChatExporter.Gui/Views/Dialogs/MessageBoxView.xaml
+++ b/DiscordChatExporter.Gui/Views/Dialogs/MessageBoxView.xaml
@@ -6,6 +6,7 @@
    xmlns:dialogs="clr-namespace:DiscordChatExporter.Gui.ViewModels.Dialogs"
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
    xmlns:s="https://github.com/canton7/Stylet"
+    xmlns:system="clr-namespace:System;assembly=System.Runtime"
    MinWidth="500"
    d:DataContext="{d:DesignInstance Type=dialogs:MessageBoxViewModel}"
    Style="{DynamicResource MaterialDesignRoot}"
@@ -41,15 +42,32 @@
            </ScrollViewer>
        </Border>

-        <!--  Close  -->
-        <Button
+        <UniformGrid
            Grid.Row="2"
            Margin="16"
-            HorizontalAlignment="Stretch"
-            Command="{s:Action Close}"
-            Content="CLOSE"
-            IsCancel="True"
-            IsDefault="True"
-            Style="{DynamicResource MaterialDesignOutlinedButton}" />
+            HorizontalAlignment="Right"
+            Columns="{Binding ButtonsCount}">
+            <!--  OK  -->
+            <Button
+                Command="{s:Action Close}"
+                Content="{Binding OkButtonText}"
+                IsDefault="True"
+                Style="{DynamicResource MaterialDesignOutlinedButton}"
+                Visibility="{Binding IsOkButtonVisible, Converter={x:Static s:BoolToVisibilityConverter.Instance}}">
+                <Button.CommandParameter>
+                    <system:Boolean>True</system:Boolean>
+                </Button.CommandParameter>
+            </Button>
+
+            <!--  Cancel  -->
+            <Button
+                Margin="8,0,0,0"
+                HorizontalAlignment="Stretch"
+                Command="{s:Action Close}"
+                Content="{Binding CancelButtonText}"
+                IsCancel="True"
+                Style="{DynamicResource MaterialDesignOutlinedButton}"
+                Visibility="{Binding IsCancelButtonVisible, Converter={x:Static s:BoolToVisibilityConverter.Instance}}" />
+        </UniformGrid>
    </Grid>
 </UserControl>