mirror of
https://github.com/Tyrrrz/DiscordChatExporter.git
synced 2025-05-23 19:26:57 -04:00
Improve UI some more
This commit is contained in:
parent
ac91c536dd
commit
daf38153f4
3 changed files with 22 additions and 12 deletions
|
@ -98,6 +98,10 @@
|
||||||
<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
|
<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
|
||||||
</Style>
|
</Style>
|
||||||
|
|
||||||
|
<Style BasedOn="{StaticResource MaterialDesignDatePicker}" TargetType="{x:Type DatePicker}">
|
||||||
|
<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
|
||||||
|
</Style>
|
||||||
|
|
||||||
<Style
|
<Style
|
||||||
x:Key="MaterialDesignFlatActionToggleButton"
|
x:Key="MaterialDesignFlatActionToggleButton"
|
||||||
BasedOn="{StaticResource MaterialDesignActionToggleButton}"
|
BasedOn="{StaticResource MaterialDesignActionToggleButton}"
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
|
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
|
||||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
xmlns:s="https://github.com/canton7/Stylet"
|
xmlns:s="https://github.com/canton7/Stylet"
|
||||||
Width="375"
|
Width="380"
|
||||||
d:DataContext="{d:DesignInstance Type=dialogs:ExportSetupViewModel}"
|
d:DataContext="{d:DesignInstance Type=dialogs:ExportSetupViewModel}"
|
||||||
SnapsToDevicePixels="True"
|
SnapsToDevicePixels="True"
|
||||||
TextElement.FontSize="13"
|
TextElement.FontSize="13"
|
||||||
|
@ -19,7 +19,7 @@
|
||||||
mc:Ignorable="d">
|
mc:Ignorable="d">
|
||||||
<StackPanel>
|
<StackPanel>
|
||||||
<!-- Guild/channel info -->
|
<!-- Guild/channel info -->
|
||||||
<Grid Margin="8,16">
|
<Grid Margin="16">
|
||||||
<Grid.ColumnDefinitions>
|
<Grid.ColumnDefinitions>
|
||||||
<ColumnDefinition Width="Auto" />
|
<ColumnDefinition Width="Auto" />
|
||||||
<ColumnDefinition Width="*" />
|
<ColumnDefinition Width="*" />
|
||||||
|
@ -40,7 +40,7 @@
|
||||||
Grid.Column="1"
|
Grid.Column="1"
|
||||||
Margin="8,0,0,0"
|
Margin="8,0,0,0"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
FontSize="17"
|
FontSize="19"
|
||||||
TextTrimming="CharacterEllipsis">
|
TextTrimming="CharacterEllipsis">
|
||||||
<Run
|
<Run
|
||||||
Foreground="{DynamicResource SecondaryTextBrush}"
|
Foreground="{DynamicResource SecondaryTextBrush}"
|
||||||
|
@ -56,7 +56,7 @@
|
||||||
|
|
||||||
<!-- Format -->
|
<!-- Format -->
|
||||||
<ComboBox
|
<ComboBox
|
||||||
Margin="8"
|
Margin="16,8"
|
||||||
materialDesign:HintAssist.Hint="Export format"
|
materialDesign:HintAssist.Hint="Export format"
|
||||||
materialDesign:HintAssist.IsFloating="True"
|
materialDesign:HintAssist.IsFloating="True"
|
||||||
IsReadOnly="True"
|
IsReadOnly="True"
|
||||||
|
@ -78,7 +78,7 @@
|
||||||
<DatePicker
|
<DatePicker
|
||||||
Grid.Row="0"
|
Grid.Row="0"
|
||||||
Grid.Column="0"
|
Grid.Column="0"
|
||||||
Margin="8"
|
Margin="16,8"
|
||||||
materialDesign:HintAssist.Hint="From (optional)"
|
materialDesign:HintAssist.Hint="From (optional)"
|
||||||
materialDesign:HintAssist.IsFloating="True"
|
materialDesign:HintAssist.IsFloating="True"
|
||||||
DisplayDateEnd="{Binding To}"
|
DisplayDateEnd="{Binding To}"
|
||||||
|
@ -86,7 +86,7 @@
|
||||||
<DatePicker
|
<DatePicker
|
||||||
Grid.Row="0"
|
Grid.Row="0"
|
||||||
Grid.Column="1"
|
Grid.Column="1"
|
||||||
Margin="8"
|
Margin="16,8"
|
||||||
materialDesign:HintAssist.Hint="To (optional)"
|
materialDesign:HintAssist.Hint="To (optional)"
|
||||||
materialDesign:HintAssist.IsFloating="True"
|
materialDesign:HintAssist.IsFloating="True"
|
||||||
DisplayDateStart="{Binding From}"
|
DisplayDateStart="{Binding From}"
|
||||||
|
@ -95,7 +95,7 @@
|
||||||
|
|
||||||
<!-- Partitioning -->
|
<!-- Partitioning -->
|
||||||
<TextBox
|
<TextBox
|
||||||
Margin="8"
|
Margin="16,8"
|
||||||
materialDesign:HintAssist.Hint="Messages per partition (optional)"
|
materialDesign:HintAssist.Hint="Messages per partition (optional)"
|
||||||
materialDesign:HintAssist.IsFloating="True"
|
materialDesign:HintAssist.IsFloating="True"
|
||||||
Text="{Binding PartitionLimit, TargetNullValue=''}" />
|
Text="{Binding PartitionLimit, TargetNullValue=''}" />
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
|
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
|
||||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
xmlns:s="https://github.com/canton7/Stylet"
|
xmlns:s="https://github.com/canton7/Stylet"
|
||||||
MinWidth="250"
|
Width="300"
|
||||||
d:DataContext="{d:DesignInstance Type=dialogs:SettingsViewModel}"
|
d:DataContext="{d:DesignInstance Type=dialogs:SettingsViewModel}"
|
||||||
SnapsToDevicePixels="True"
|
SnapsToDevicePixels="True"
|
||||||
TextElement.FontSize="13"
|
TextElement.FontSize="13"
|
||||||
|
@ -17,16 +17,22 @@
|
||||||
TextOptions.TextRenderingMode="Auto"
|
TextOptions.TextRenderingMode="Auto"
|
||||||
mc:Ignorable="d">
|
mc:Ignorable="d">
|
||||||
<StackPanel>
|
<StackPanel>
|
||||||
|
<TextBlock
|
||||||
|
Margin="16"
|
||||||
|
FontSize="17"
|
||||||
|
Foreground="{DynamicResource PrimaryTextBrush}"
|
||||||
|
Text="Settings" />
|
||||||
|
|
||||||
<!-- Date format -->
|
<!-- Date format -->
|
||||||
<TextBox
|
<TextBox
|
||||||
Margin="16,16,16,8"
|
Margin="16,8"
|
||||||
materialDesign:HintAssist.Hint="Date format"
|
materialDesign:HintAssist.Hint="Date format"
|
||||||
materialDesign:HintAssist.IsFloating="True"
|
materialDesign:HintAssist.IsFloating="True"
|
||||||
Text="{Binding DateFormat}" />
|
Text="{Binding DateFormat}" />
|
||||||
|
|
||||||
<!-- Message group limit -->
|
<!-- Message group limit -->
|
||||||
<TextBox
|
<TextBox
|
||||||
Margin="16,8,16,8"
|
Margin="16,8"
|
||||||
materialDesign:HintAssist.Hint="Message group limit"
|
materialDesign:HintAssist.Hint="Message group limit"
|
||||||
materialDesign:HintAssist.IsFloating="True"
|
materialDesign:HintAssist.IsFloating="True"
|
||||||
Text="{Binding MessageGroupLimit}" />
|
Text="{Binding MessageGroupLimit}" />
|
||||||
|
@ -34,11 +40,11 @@
|
||||||
<!-- Auto-updates -->
|
<!-- Auto-updates -->
|
||||||
<DockPanel LastChildFill="False">
|
<DockPanel LastChildFill="False">
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Margin="16,8,16,8"
|
Margin="16,8"
|
||||||
DockPanel.Dock="Left"
|
DockPanel.Dock="Left"
|
||||||
Text="Auto-updates" />
|
Text="Auto-updates" />
|
||||||
<ToggleButton
|
<ToggleButton
|
||||||
Margin="16,8,16,8"
|
Margin="16,8"
|
||||||
DockPanel.Dock="Right"
|
DockPanel.Dock="Right"
|
||||||
IsChecked="{Binding IsAutoUpdateEnabled}" />
|
IsChecked="{Binding IsAutoUpdateEnabled}" />
|
||||||
</DockPanel>
|
</DockPanel>
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue