Compare commits

..

4 Commits

Author SHA1 Message Date
Cap LaBuff 0358045c94 Only display http(s) URLs as links in HTML export (#1568) 2026-07-14 12:09:42 +03:00
tyrrrz 31de8a5b06 Apply updated formatting rules 2026-07-04 18:51:27 +03:00
dependabot[bot] efd430ed29 Bump the actions group with 3 updates (#1564)
Signed-off-by: dependabot[bot] <support@github.com>
2026-07-04 18:49:28 +03:00
dependabot[bot] 623c688e1b Bump the nuget group with 14 updates (#1565)
Signed-off-by: dependabot[bot] <support@github.com>
2026-07-04 18:48:21 +03:00
11 changed files with 1071 additions and 984 deletions
+2 -2
View File
@@ -23,7 +23,7 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
- name: Install Docker Buildx
uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4.1.0
@@ -55,7 +55,7 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
- name: Install Docker Buildx
uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4.1.0
+7 -7
View File
@@ -26,10 +26,10 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
- name: Install .NET
uses: actions/setup-dotnet@9a946fdbd5fb07b82b2f5a4466058b876ab72bb2 # v5.3.0
uses: actions/setup-dotnet@26b0ec14cb23fa6904739307f278c14f94c95bf1 # v5.4.0
# Build the project separately to discern between build and format errors
- name: Build
@@ -62,10 +62,10 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
- name: Install .NET
uses: actions/setup-dotnet@9a946fdbd5fb07b82b2f5a4466058b876ab72bb2 # v5.3.0
uses: actions/setup-dotnet@26b0ec14cb23fa6904739307f278c14f94c95bf1 # v5.4.0
- name: Run tests
env:
@@ -81,7 +81,7 @@ jobs:
DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.Format=opencover
- name: Upload coverage
uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 # v6.0.1
uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7.0.0
with:
token: ${{ secrets.CODECOV_TOKEN }}
@@ -117,10 +117,10 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
- name: Install .NET
uses: actions/setup-dotnet@9a946fdbd5fb07b82b2f5a4466058b876ab72bb2 # v5.3.0
uses: actions/setup-dotnet@26b0ec14cb23fa6904739307f278c14f94c95bf1 # v5.4.0
- name: Publish app
run: >
+14 -14
View File
@@ -4,38 +4,38 @@
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="AngleSharp" Version="1.4.0" />
<PackageVersion Include="AngleSharp" Version="1.5.1" />
<PackageVersion Include="AsyncImageLoader.Avalonia" Version="3.8.0" />
<PackageVersion Include="AsyncKeyedLock" Version="8.0.2" />
<PackageVersion Include="Avalonia" Version="12.0.4" />
<PackageVersion Include="Avalonia.Desktop" Version="12.0.4" />
<PackageVersion Include="Avalonia" Version="12.0.5" />
<PackageVersion Include="Avalonia.Desktop" Version="12.0.5" />
<PackageVersion Include="CliFx" Version="3.0.0" />
<PackageVersion Include="Cogwheel" Version="2.1.1" />
<PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.2" />
<PackageVersion Include="coverlet.collector" Version="10.0.1" />
<PackageVersion Include="CSharpier.MsBuild" Version="1.2.6" />
<PackageVersion Include="CSharpier.MsBuild" Version="1.3.0" />
<PackageVersion Include="Deorcify" Version="2.0.1" />
<PackageVersion Include="DialogHost.Avalonia" Version="0.12.2" />
<PackageVersion Include="FluentAssertions" Version="8.10.0" />
<PackageVersion Include="GitHubActionsTestLogger" Version="3.0.4" />
<PackageVersion Include="Gress" Version="2.2.0" />
<PackageVersion Include="JsonExtensions" Version="1.2.0" />
<PackageVersion Include="Markdig" Version="1.2.0" />
<PackageVersion Include="JsonExtensions" Version="1.2.3" />
<PackageVersion Include="Markdig" Version="1.3.2" />
<PackageVersion Include="Material.Avalonia" Version="3.16.1" />
<PackageVersion Include="Material.Icons.Avalonia" Version="3.0.2" />
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="10.0.8" />
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="10.0.9" />
<PackageVersion
Include="Microsoft.Extensions.Configuration.EnvironmentVariables"
Version="10.0.8"
Version="10.0.9"
/>
<PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.8" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.8" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.6.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.9" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.9" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.7.0" />
<PackageVersion Include="Onova" Version="2.6.13" />
<PackageVersion Include="Polly" Version="8.6.6" />
<PackageVersion Include="PowerKit" Version="2.0.1" />
<PackageVersion Include="Polly" Version="8.7.0" />
<PackageVersion Include="PowerKit" Version="2.0.2" />
<PackageVersion Include="RazorBlade" Version="1.0.0" />
<PackageVersion Include="Spectre.Console" Version="0.55.2" />
<PackageVersion Include="Spectre.Console" Version="0.57.1" />
<PackageVersion Include="Superpower" Version="3.1.0" />
<PackageVersion Include="ThisAssembly.Project" Version="2.1.2" />
<PackageVersion Include="WebMarkupMin.Core" Version="2.21.0" />
@@ -264,7 +264,7 @@ internal static partial class MarkdownParser
private static readonly IMatcher<MarkdownContext, MarkdownNode> MaskedLinkNodeMatcher =
new RegexMatcher<MarkdownContext, MarkdownNode>(
// Capture [title](link)
new Regex(@"\[(.+?)\]\((.+?)\)", DefaultRegexOptions),
new Regex(@"\[(.+?)\]\((https?://\S*[^\.,:;""'\s])\)", DefaultRegexOptions),
(c, s, m) => new LinkNode(m.Groups[2].Value, Parse(c, s.Relocate(m.Groups[1])))
);
+8 -3
View File
@@ -9,7 +9,8 @@
xmlns:materialIcons="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
xmlns:materialStyles="clr-namespace:Material.Styles.Themes;assembly=Material.Styles"
Name="DiscordChatExporter"
ActualThemeVariantChanged="Application_OnActualThemeVariantChanged">
ActualThemeVariantChanged="Application_OnActualThemeVariantChanged"
>
<Application.DataTemplates>
<framework:ViewManager />
</Application.DataTemplates>
@@ -19,7 +20,8 @@
<materialStyles:MaterialTheme
BaseTheme="Light"
PrimaryColor="Grey"
SecondaryColor="DeepOrange" />
SecondaryColor="DeepOrange"
/>
<materialIcons:MaterialIconStyles />
<dialogHostAvalonia:DialogHostStyles />
@@ -133,7 +135,10 @@
<!-- Toggle switch -->
<Style Selector="ToggleSwitch">
<Setter Property="materialAssists:ToggleSwitchAssist.SwitchThumbOffBackground" Value="{DynamicResource ToggleBackgroundBrush}" />
<Setter
Property="materialAssists:ToggleSwitchAssist.SwitchThumbOffBackground"
Value="{DynamicResource ToggleBackgroundBrush}"
/>
</Style>
<!-- Tooltip -->
@@ -9,13 +9,15 @@
xmlns:materialStyles="clr-namespace:Material.Styles.Controls;assembly=Material.Styles"
x:Name="UserControl"
x:DataType="components:DashboardViewModel"
Loaded="UserControl_OnLoaded">
Loaded="UserControl_OnLoaded"
>
<DockPanel>
<!-- Header -->
<StackPanel
Background="{DynamicResource MaterialDarkBackgroundBrush}"
DockPanel.Dock="Top"
Orientation="Vertical">
Orientation="Vertical"
>
<Grid Margin="12,12,8,12" ColumnDefinitions="*,Auto">
<materialStyles:Card Grid.Column="0">
<!-- Token -->
@@ -26,7 +28,8 @@
PlaceholderText="{Binding LocalizationManager.TokenPlaceholderText}"
RevealPassword="{Binding $self.IsFocused}"
Text="{Binding Token}"
Theme="{DynamicResource SoloTextBox}">
Theme="{DynamicResource SoloTextBox}"
>
<TextBox.InnerLeftContent>
<materialIcons:MaterialIcon
Grid.Column="0"
@@ -34,7 +37,8 @@
Height="24"
Margin="4,0,8,0"
Foreground="{DynamicResource PrimaryHueMidBrush}"
Kind="Key" />
Kind="Key"
/>
</TextBox.InnerLeftContent>
<TextBox.InnerRightContent>
<Button
@@ -44,11 +48,9 @@
Command="{Binding PullGuildsCommand}"
IsDefault="True"
Theme="{DynamicResource MaterialFlatButton}"
ToolTip.Tip="{Binding LocalizationManager.PullGuildsTooltip}">
<materialIcons:MaterialIcon
Width="24"
Height="24"
Kind="ArrowRight" />
ToolTip.Tip="{Binding LocalizationManager.PullGuildsTooltip}"
>
<materialIcons:MaterialIcon Width="24" Height="24" Kind="ArrowRight" />
</Button>
</TextBox.InnerRightContent>
</TextBox>
@@ -63,11 +65,9 @@
Command="{Binding ShowSettingsCommand}"
Foreground="{DynamicResource MaterialDarkForegroundBrush}"
Theme="{DynamicResource MaterialFlatButton}"
ToolTip.Tip="{Binding LocalizationManager.SettingsTooltip}">
<materialIcons:MaterialIcon
Width="24"
Height="24"
Kind="Settings" />
ToolTip.Tip="{Binding LocalizationManager.SettingsTooltip}"
>
<materialIcons:MaterialIcon Width="24" Height="24" Kind="Settings" />
</Button>
</Grid>
@@ -76,14 +76,16 @@
Height="2"
Background="Transparent"
IsIndeterminate="{Binding IsProgressIndeterminate}"
Value="{Binding Progress.Current.Fraction, Mode=OneWay}" />
Value="{Binding Progress.Current.Fraction, Mode=OneWay}"
/>
</StackPanel>
<!-- Body -->
<Panel
Background="{DynamicResource MaterialCardBackgroundBrush}"
DockPanel.Dock="Bottom"
IsEnabled="{Binding !IsBusy}">
IsEnabled="{Binding !IsBusy}"
>
<Panel.Styles>
<Style Selector="Panel">
<Style Selector="^:disabled">
@@ -97,14 +99,16 @@
<Border
Grid.Column="0"
BorderBrush="{DynamicResource MaterialDividerBrush}"
BorderThickness="0,0,1,0">
BorderThickness="0,0,1,0"
>
<ListBox
x:Name="AvailableGuildsListBox"
ItemsSource="{Binding AvailableGuilds}"
ScrollViewer.VerticalScrollBarVisibility="Hidden"
SelectedItem="{Binding SelectedGuild}"
SelectionChanged="AvailableGuildsListBox_OnSelectionChanged"
SelectionMode="Single">
SelectionMode="Single"
>
<ListBox.Styles>
<Style Selector="ListBox">
<Style Selector="^ ListBoxItem">
@@ -121,13 +125,11 @@
Width="48"
Height="48"
Margin="12"
Fill="{DynamicResource MaterialDividerBrush}" />
Fill="{DynamicResource MaterialDividerBrush}"
/>
<!-- Guild icon -->
<Ellipse
Width="48"
Height="48"
Margin="12">
<Ellipse Width="48" Height="48" Margin="12">
<Ellipse.Fill>
<ImageBrush asyncImageLoader:ImageBrushLoader.Source="{Binding IconUrl}" />
</Ellipse.Fill>
@@ -146,7 +148,8 @@
SelectedItems="{Binding SelectedChannels}"
SelectionChanged="AvailableChannelsTreeView_OnSelectionChanged"
SelectionMode="Multiple"
TextSearch.Text="Name">
TextSearch.Text="Name"
>
<TreeView.Styles>
<Style Selector="TreeView">
<Style Selector="^ TreeViewItem">
@@ -161,7 +164,8 @@
Background="Transparent"
Classes.category="{Binding Channel.IsCategory}"
ColumnDefinitions="Auto,*,Auto"
DoubleTapped="ChannelGrid_OnDoubleTapped">
DoubleTapped="ChannelGrid_OnDoubleTapped"
>
<Grid.Styles>
<Style Selector="Grid">
<Style Selector="^:not(.category)">
@@ -169,7 +173,10 @@
<Template>
<TextBlock>
<Run Text="{Binding #UserControl.DataContext.LocalizationManager.LastMessageSentTooltip}" />
<Run FontWeight="SemiBold" Text="{Binding Channel.LastMessageId, Converter={x:Static converters:SnowflakeToTimestampStringConverter.Instance}, TargetNullValue=never, Mode=OneWay}" />
<Run
FontWeight="SemiBold"
Text="{Binding Channel.LastMessageId, Converter={x:Static converters:SnowflakeToTimestampStringConverter.Instance}, TargetNullValue=never, Mode=OneWay}"
/>
</TextBlock>
</Template>
</Setter>
@@ -182,7 +189,8 @@
Grid.Column="0"
Margin="0,0,4,0"
Classes.voice="{Binding Channel.IsVoice}"
IsVisible="{Binding !Channel.IsCategory}">
IsVisible="{Binding !Channel.IsCategory}"
>
<materialIcons:MaterialIcon.Styles>
<Style Selector="materialIcons|MaterialIcon">
<Setter Property="Kind" Value="Pound" />
@@ -199,7 +207,8 @@
Grid.Column="1"
Margin="0,12"
FontSize="14"
Text="{Binding Channel.Name, Mode=OneWay}" />
Text="{Binding Channel.Name, Mode=OneWay}"
/>
<!-- Checkmark -->
<materialIcons:MaterialIcon
@@ -208,7 +217,8 @@
Height="24"
Margin="16,0"
IsVisible="{Binding $parent[TreeViewItem].IsSelected}"
Kind="Check" />
Kind="Check"
/>
</Grid>
</TreeDataTemplate>
</TreeView.ItemTemplate>
@@ -227,13 +237,15 @@
Width="18"
Height="18"
Foreground="{DynamicResource PrimaryHueMidBrush}"
Kind="Account" />
Kind="Account"
/>
</InlineUIContainer>
<Run Text="" />
<Run
FontSize="16"
FontWeight="SemiBold"
Text="{Binding LocalizationManager.TokenPersonalHeader}" />
Text="{Binding LocalizationManager.TokenPersonalHeader}"
/>
</TextBlock>
<TextBlock
@@ -241,14 +253,16 @@
FontWeight="Light"
Inlines="{Binding LocalizationManager.TokenPersonalTosWarning, Converter={x:Static converters:MarkdownToInlinesConverter.Instance}}"
LineHeight="23"
TextWrapping="Wrap" />
TextWrapping="Wrap"
/>
<TextBlock
FontSize="14"
FontWeight="Light"
Inlines="{Binding LocalizationManager.TokenPersonalInstructions, Converter={x:Static converters:MarkdownToInlinesConverter.Instance}}"
LineHeight="23"
TextWrapping="Wrap" />
TextWrapping="Wrap"
/>
<!-- Bot token -->
<TextBlock Margin="0,12,0,0">
@@ -257,13 +271,15 @@
Width="18"
Height="18"
Foreground="{DynamicResource PrimaryHueMidBrush}"
Kind="Robot" />
Kind="Robot"
/>
</InlineUIContainer>
<Run Text="" />
<Run
FontSize="16"
FontWeight="SemiBold"
Text="{Binding LocalizationManager.TokenBotHeader}" />
Text="{Binding LocalizationManager.TokenBotHeader}"
/>
</TextBlock>
<TextBlock
@@ -271,7 +287,8 @@
FontWeight="Light"
Inlines="{Binding LocalizationManager.TokenBotInstructions, Converter={x:Static converters:MarkdownToInlinesConverter.Instance}}"
LineHeight="23"
TextWrapping="Wrap" />
TextWrapping="Wrap"
/>
<TextBlock
Margin="0,12,0,0"
@@ -279,7 +296,8 @@
FontWeight="Light"
Inlines="{Binding LocalizationManager.TokenHelpText, Converter={x:Static converters:MarkdownToInlinesConverter.Instance}}"
LineHeight="23"
TextWrapping="Wrap" />
TextWrapping="Wrap"
/>
</StackPanel>
</ScrollViewer>
</Panel>
@@ -296,11 +314,9 @@
Command="{Binding ExportCommand}"
Foreground="{DynamicResource MaterialSecondaryMidForegroundBrush}"
IsVisible="{Binding $self.IsEffectivelyEnabled}"
Theme="{DynamicResource MaterialIconButton}">
<materialIcons:MaterialIcon
Width="32"
Height="32"
Kind="Download" />
Theme="{DynamicResource MaterialIconButton}"
>
<materialIcons:MaterialIcon Width="32" Height="32" Kind="Download" />
</Button>
</Panel>
</DockPanel>
@@ -2,13 +2,15 @@
x:Class="DiscordChatExporter.Gui.Views.Controls.HyperLink"
xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:controls="clr-namespace:DiscordChatExporter.Gui.Views.Controls">
xmlns:controls="clr-namespace:DiscordChatExporter.Gui.Views.Controls"
>
<TextBlock
x:Name="TextBlock"
Cursor="Hand"
Foreground="{DynamicResource MaterialSecondaryDarkBrush}"
PointerReleased="TextBlock_OnPointerReleased"
Text="{Binding $parent[controls:HyperLink].Text, Mode=OneWay}">
Text="{Binding $parent[controls:HyperLink].Text, Mode=OneWay}"
>
<TextBlock.Styles>
<Style Selector="TextBlock">
<Style Selector="^:pointerover">
@@ -10,18 +10,13 @@
xmlns:utils="clr-namespace:DiscordChatExporter.Gui.Utils"
x:Name="UserControl"
Width="380"
x:DataType="dialogs:ExportSetupViewModel">
x:DataType="dialogs:ExportSetupViewModel"
>
<Grid RowDefinitions="Auto,*,Auto">
<!-- Guild/channel info -->
<Grid
Grid.Row="0"
Margin="16"
ColumnDefinitions="Auto,*">
<Grid Grid.Row="0" Margin="16" ColumnDefinitions="Auto,*">
<!-- Guild icon -->
<Ellipse
Grid.Column="0"
Width="32"
Height="32">
<Ellipse Grid.Column="0" Width="32" Height="32">
<Ellipse.Fill>
<ImageBrush asyncImageLoader:ImageBrushLoader.Source="{Binding Guild.IconUrl}" />
</Ellipse.Fill>
@@ -35,7 +30,8 @@
FontSize="19"
FontWeight="Light"
IsVisible="{Binding !IsSingleChannel}"
TextTrimming="CharacterEllipsis">
TextTrimming="CharacterEllipsis"
>
<Run Text="{Binding Channels.Count, FallbackValue=0, Mode=OneWay}" />
<Run Text="{Binding LocalizationManager.ChannelsSelectedText}" />
</TextBlock>
@@ -49,8 +45,10 @@
FontWeight="Light"
IsVisible="{Binding IsSingleChannel}"
TextTrimming="CharacterEllipsis"
ToolTip.Tip="{Binding Channels[0], Converter={x:Static converters:ChannelToHierarchicalNameStringConverter.Instance}}">
<Run Text="{Binding Channels[0].Parent.Name, StringFormat='{}{0} / ', FallbackValue='', TargetNullValue='', Mode=OneWay}" /><Run FontWeight="SemiBold" Text="{Binding Channels[0].Name, Mode=OneWay}" />
ToolTip.Tip="{Binding Channels[0], Converter={x:Static converters:ChannelToHierarchicalNameStringConverter.Instance}}"
>
<Run Text="{Binding Channels[0].Parent.Name, StringFormat='{}{0} / ', FallbackValue='', TargetNullValue='', Mode=OneWay}" />
<Run FontWeight="SemiBold" Text="{Binding Channels[0].Name, Mode=OneWay}" />
</TextBlock>
</Grid>
@@ -58,7 +56,8 @@
Grid.Row="1"
Padding="0,8"
BorderBrush="{DynamicResource MaterialDividerBrush}"
BorderThickness="0,1">
BorderThickness="0,1"
>
<ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
<StackPanel Orientation="Vertical">
<!-- Output path -->
@@ -66,12 +65,14 @@
Margin="16,8"
materialAssists:TextFieldAssist.Label="{Binding LocalizationManager.OutputPathLabel}"
Text="{Binding OutputPath}"
Theme="{DynamicResource FilledTextBox}">
Theme="{DynamicResource FilledTextBox}"
>
<ToolTip.Tip>
<TextBlock
MaxWidth="400"
Inlines="{Binding LocalizationManager.OutputPathTooltip, Converter={x:Static converters:MarkdownToInlinesConverter.Instance}}"
TextWrapping="Wrap" />
TextWrapping="Wrap"
/>
</ToolTip.Tip>
<TextBox.InnerRightContent>
<Button
@@ -79,11 +80,9 @@
Padding="8"
VerticalAlignment="Center"
Command="{Binding ShowOutputPathPromptCommand}"
Theme="{DynamicResource MaterialFlatButton}">
<materialIcons:MaterialIcon
Width="20"
Height="20"
Kind="FolderOpen" />
Theme="{DynamicResource MaterialFlatButton}"
>
<materialIcons:MaterialIcon Width="20" Height="20" Kind="FolderOpen" />
</Button>
</TextBox.InnerRightContent>
</TextBox>
@@ -95,7 +94,8 @@
ItemsSource="{Binding AvailableFormats}"
SelectedItem="{Binding SelectedFormat}"
Theme="{DynamicResource MaterialFilledComboBox}"
ToolTip.Tip="{Binding LocalizationManager.FormatTooltip}">
ToolTip.Tip="{Binding LocalizationManager.FormatTooltip}"
>
<ComboBox.ItemTemplate>
<DataTemplate>
<TextBlock Text="{Binding Converter={x:Static converters:ExportFormatToStringConverter.Instance}}" />
@@ -108,19 +108,17 @@
Margin="16,8"
IsVisible="{Binding IsAdvancedSectionDisplayed}"
Orientation="Vertical"
Spacing="16">
Spacing="16"
>
<!-- Date limits -->
<Grid
ColumnDefinitions="*,*"
ColumnSpacing="16"
RowDefinitions="*,*"
RowSpacing="16">
<Grid ColumnDefinitions="*,*" ColumnSpacing="16" RowDefinitions="*,*" RowSpacing="16">
<DatePicker
Grid.Row="0"
Grid.Column="0"
materialAssists:TextFieldAssist.Label="{Binding LocalizationManager.AfterDateLabel}"
SelectedDate="{Binding AfterDate}"
ToolTip.Tip="{Binding LocalizationManager.AfterDateTooltip}">
ToolTip.Tip="{Binding LocalizationManager.AfterDateTooltip}"
>
<DatePicker.Styles>
<Style Selector="DatePicker">
<Style Selector="^ /template/ TextBox#DisplayTextBox">
@@ -134,7 +132,8 @@
Grid.Column="1"
materialAssists:TextFieldAssist.Label="{Binding LocalizationManager.BeforeDateLabel}"
SelectedDate="{Binding BeforeDate}"
ToolTip.Tip="{Binding LocalizationManager.BeforeDateTooltip}">
ToolTip.Tip="{Binding LocalizationManager.BeforeDateTooltip}"
>
<DatePicker.Styles>
<Style Selector="DatePicker">
<Style Selector="^ /template/ TextBox#DisplayTextBox">
@@ -152,7 +151,8 @@
ClockIdentifier="{x:Static utils:Internationalization.AvaloniaClockIdentifier}"
IsEnabled="{Binding IsAfterDateSet}"
SelectedTime="{Binding AfterTime}"
ToolTip.Tip="{Binding LocalizationManager.AfterTimeTooltip}">
ToolTip.Tip="{Binding LocalizationManager.AfterTimeTooltip}"
>
<TimePicker.Styles>
<Style Selector="TimePicker">
<Style Selector="^ /template/ TextBox#PART_DisplayTextBox">
@@ -168,7 +168,8 @@
ClockIdentifier="{x:Static utils:Internationalization.AvaloniaClockIdentifier}"
IsEnabled="{Binding IsBeforeDateSet}"
SelectedTime="{Binding BeforeTime}"
ToolTip.Tip="{Binding LocalizationManager.BeforeTimeTooltip}">
ToolTip.Tip="{Binding LocalizationManager.BeforeTimeTooltip}"
>
<TimePicker.Styles>
<Style Selector="TimePicker">
<Style Selector="^ /template/ TextBox#PART_DisplayTextBox">
@@ -184,30 +185,50 @@
materialAssists:TextFieldAssist.Label="{Binding LocalizationManager.PartitionLimitLabel}"
Text="{Binding PartitionLimitValue}"
Theme="{DynamicResource FilledTextBox}"
ToolTip.Tip="{Binding LocalizationManager.PartitionLimitTooltip}" />
ToolTip.Tip="{Binding LocalizationManager.PartitionLimitTooltip}"
/>
<!-- Filtering -->
<TextBox
materialAssists:TextFieldAssist.Label="{Binding LocalizationManager.MessageFilterLabel}"
Text="{Binding MessageFilterValue}"
Theme="{DynamicResource FilledTextBox}"
ToolTip.Tip="{Binding LocalizationManager.MessageFilterTooltip}" />
ToolTip.Tip="{Binding LocalizationManager.MessageFilterTooltip}"
/>
<!-- Reverse message order -->
<DockPanel LastChildFill="False" ToolTip.Tip="{Binding LocalizationManager.ReverseMessageOrderTooltip}">
<TextBlock DockPanel.Dock="Left" Text="{Binding LocalizationManager.ReverseMessageOrderLabel}" />
<DockPanel
LastChildFill="False"
ToolTip.Tip="{Binding LocalizationManager.ReverseMessageOrderTooltip}"
>
<TextBlock
DockPanel.Dock="Left"
Text="{Binding LocalizationManager.ReverseMessageOrderLabel}"
/>
<ToggleSwitch DockPanel.Dock="Right" IsChecked="{Binding IsReverseMessageOrder}" />
</DockPanel>
<!-- Markdown formatting -->
<DockPanel LastChildFill="False" ToolTip.Tip="{Binding LocalizationManager.FormatMarkdownTooltip}">
<TextBlock DockPanel.Dock="Left" Text="{Binding LocalizationManager.FormatMarkdownLabel}" />
<DockPanel
LastChildFill="False"
ToolTip.Tip="{Binding LocalizationManager.FormatMarkdownTooltip}"
>
<TextBlock
DockPanel.Dock="Left"
Text="{Binding LocalizationManager.FormatMarkdownLabel}"
/>
<ToggleSwitch DockPanel.Dock="Right" IsChecked="{Binding ShouldFormatMarkdown}" />
</DockPanel>
<!-- Download assets -->
<DockPanel LastChildFill="False" ToolTip.Tip="{Binding LocalizationManager.DownloadAssetsTooltip}">
<TextBlock DockPanel.Dock="Left" Text="{Binding LocalizationManager.DownloadAssetsLabel}" />
<DockPanel
LastChildFill="False"
ToolTip.Tip="{Binding LocalizationManager.DownloadAssetsTooltip}"
>
<TextBlock
DockPanel.Dock="Left"
Text="{Binding LocalizationManager.DownloadAssetsLabel}"
/>
<ToggleSwitch DockPanel.Dock="Right" IsChecked="{Binding ShouldDownloadAssets}" />
</DockPanel>
@@ -215,8 +236,12 @@
<DockPanel
IsEnabled="{Binding ShouldDownloadAssets}"
LastChildFill="False"
ToolTip.Tip="{Binding LocalizationManager.ReuseAssetsTooltip}">
<TextBlock DockPanel.Dock="Left" Text="{Binding LocalizationManager.ReuseAssetsLabel}" />
ToolTip.Tip="{Binding LocalizationManager.ReuseAssetsTooltip}"
>
<TextBlock
DockPanel.Dock="Left"
Text="{Binding LocalizationManager.ReuseAssetsLabel}"
/>
<ToggleSwitch DockPanel.Dock="Right" IsChecked="{Binding ShouldReuseAssets}" />
</DockPanel>
@@ -226,18 +251,17 @@
IsEnabled="{Binding ShouldDownloadAssets}"
Text="{Binding AssetsDirPath}"
Theme="{DynamicResource FilledTextBox}"
ToolTip.Tip="{Binding LocalizationManager.AssetsDirPathTooltip}">
ToolTip.Tip="{Binding LocalizationManager.AssetsDirPathTooltip}"
>
<TextBox.InnerRightContent>
<Button
Margin="8,8,8,6"
Padding="8"
VerticalAlignment="Center"
Command="{Binding ShowAssetsDirPathPromptCommand}"
Theme="{DynamicResource MaterialFlatButton}">
<materialIcons:MaterialIcon
Width="20"
Height="20"
Kind="FolderOpen" />
Theme="{DynamicResource MaterialFlatButton}"
>
<materialIcons:MaterialIcon Width="20" Height="20" Kind="FolderOpen" />
</Button>
</TextBox.InnerRightContent>
</TextBox>
@@ -247,16 +271,13 @@
</Border>
<!-- Buttons -->
<Grid
Grid.Row="2"
Margin="16"
ColumnDefinitions="Auto,*,Auto,Auto"
ColumnSpacing="8">
<Grid Grid.Row="2" Margin="16" ColumnDefinitions="Auto,*,Auto,Auto" ColumnSpacing="8">
<ToggleButton
Grid.Column="0"
IsChecked="{Binding IsAdvancedSectionDisplayed}"
Theme="{DynamicResource MaterialOutlineButton}"
ToolTip.Tip="{Binding LocalizationManager.AdvancedOptionsTooltip}">
ToolTip.Tip="{Binding LocalizationManager.AdvancedOptionsTooltip}"
>
<Button.Styles>
<Style Selector="ToggleButton">
<Setter Property="Content" Value="MORE" />
@@ -273,13 +294,15 @@
Command="{Binding ConfirmCommand}"
Content="{Binding LocalizationManager.ExportButton}"
IsDefault="True"
Theme="{DynamicResource MaterialOutlineButton}" />
Theme="{DynamicResource MaterialOutlineButton}"
/>
<Button
Grid.Column="3"
Command="{Binding CloseCommand}"
Content="{Binding LocalizationManager.CancelButton}"
IsCancel="True"
Theme="{DynamicResource MaterialOutlineButton}" />
Theme="{DynamicResource MaterialOutlineButton}"
/>
</Grid>
</Grid>
</UserControl>
@@ -5,7 +5,8 @@
xmlns:dialogs="clr-namespace:DiscordChatExporter.Gui.ViewModels.Dialogs"
xmlns:system="clr-namespace:System;assembly=System.Runtime"
Width="500"
x:DataType="dialogs:MessageBoxViewModel">
x:DataType="dialogs:MessageBoxViewModel"
>
<Grid RowDefinitions="Auto,*,Auto">
<!-- Title -->
<TextBlock
@@ -15,26 +16,22 @@
FontWeight="Light"
Text="{Binding Title}"
TextTrimming="CharacterEllipsis"
ToolTip.Tip="{Binding Title}" />
ToolTip.Tip="{Binding Title}"
/>
<!-- Message -->
<Border
Grid.Row="1"
Padding="0,8"
BorderBrush="{DynamicResource MaterialDividerBrush}"
BorderThickness="0,1">
BorderThickness="0,1"
>
<ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
<TextBlock
Margin="16,8"
Text="{Binding Message}"
TextWrapping="Wrap" />
<TextBlock Margin="16,8" Text="{Binding Message}" TextWrapping="Wrap" />
</ScrollViewer>
</Border>
<UniformGrid
Grid.Row="2"
Margin="8"
Columns="{Binding ButtonsCount}">
<UniformGrid Grid.Row="2" Margin="8" Columns="{Binding ButtonsCount}">
<!-- OK -->
<Button
Margin="8"
@@ -43,14 +40,16 @@
IsDefault="True"
IsVisible="{Binding IsDefaultButtonVisible}"
Theme="{DynamicResource MaterialOutlineButton}"
ToolTip.Tip="{Binding DefaultButtonText}">
ToolTip.Tip="{Binding DefaultButtonText}"
>
<Button.CommandParameter>
<system:Boolean>True</system:Boolean>
</Button.CommandParameter>
<TextBlock
Text="{Binding DefaultButtonText}"
TextAlignment="Center"
TextTrimming="CharacterEllipsis" />
TextTrimming="CharacterEllipsis"
/>
</Button>
<!-- Cancel -->
@@ -61,11 +60,13 @@
IsCancel="True"
IsVisible="{Binding IsCancelButtonVisible}"
Theme="{DynamicResource MaterialOutlineButton}"
ToolTip.Tip="{Binding CancelButtonText}">
ToolTip.Tip="{Binding CancelButtonText}"
>
<TextBlock
Text="{Binding CancelButtonText}"
TextAlignment="Center"
TextTrimming="CharacterEllipsis" />
TextTrimming="CharacterEllipsis"
/>
</Button>
</UniformGrid>
</Grid>
@@ -5,25 +5,25 @@
xmlns:converters="clr-namespace:DiscordChatExporter.Gui.Converters"
xmlns:dialogs="clr-namespace:DiscordChatExporter.Gui.ViewModels.Dialogs"
Width="380"
x:DataType="dialogs:SettingsViewModel">
x:DataType="dialogs:SettingsViewModel"
>
<Grid RowDefinitions="Auto,*,Auto">
<TextBlock
Grid.Row="0"
Margin="16"
FontSize="19"
FontWeight="Light"
Text="{Binding LocalizationManager.SettingsTitle}" />
Text="{Binding LocalizationManager.SettingsTitle}"
/>
<Border
Grid.Row="1"
Padding="0,8"
BorderBrush="{DynamicResource MaterialDividerBrush}"
BorderThickness="0,1">
BorderThickness="0,1"
>
<ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
<StackPanel
Margin="16,8"
Orientation="Vertical"
Spacing="16">
<StackPanel Margin="16,8" Orientation="Vertical" Spacing="16">
<!-- Theme -->
<DockPanel LastChildFill="False" ToolTip.Tip="{Binding LocalizationManager.ThemeTooltip}">
<TextBlock DockPanel.Dock="Left" Text="{Binding LocalizationManager.ThemeLabel}" />
@@ -31,24 +31,30 @@
Width="150"
DockPanel.Dock="Right"
ItemsSource="{Binding AvailableThemes}"
SelectedItem="{Binding Theme}" />
SelectedItem="{Binding Theme}"
/>
</DockPanel>
<!-- Language -->
<DockPanel LastChildFill="False" ToolTip.Tip="{Binding LocalizationManager.LanguageTooltip}">
<DockPanel
LastChildFill="False"
ToolTip.Tip="{Binding LocalizationManager.LanguageTooltip}"
>
<TextBlock DockPanel.Dock="Left" Text="{Binding LocalizationManager.LanguageLabel}" />
<ComboBox
Width="150"
DockPanel.Dock="Right"
ItemsSource="{Binding AvailableLanguages}"
SelectedItem="{Binding Language}" />
SelectedItem="{Binding Language}"
/>
</DockPanel>
<!-- Auto-updates -->
<DockPanel
IsVisible="{Binding IsAutoUpdateAvailable}"
LastChildFill="False"
ToolTip.Tip="{Binding LocalizationManager.AutoUpdateTooltip}">
ToolTip.Tip="{Binding LocalizationManager.AutoUpdateTooltip}"
>
<TextBlock DockPanel.Dock="Left" Text="{Binding LocalizationManager.AutoUpdateLabel}" />
<ToggleSwitch DockPanel.Dock="Right" IsChecked="{Binding IsAutoUpdateEnabled}" />
</DockPanel>
@@ -59,20 +65,31 @@
<TextBlock
MaxWidth="400"
Inlines="{Binding LocalizationManager.PersistTokenTooltip, Converter={x:Static converters:MarkdownToInlinesConverter.Instance}}"
TextWrapping="Wrap" />
TextWrapping="Wrap"
/>
</ToolTip.Tip>
<TextBlock DockPanel.Dock="Left" Text="{Binding LocalizationManager.PersistTokenLabel}" />
<TextBlock
DockPanel.Dock="Left"
Text="{Binding LocalizationManager.PersistTokenLabel}"
/>
<ToggleSwitch DockPanel.Dock="Right" IsChecked="{Binding IsTokenPersisted}" />
</DockPanel>
<!-- Rate limit preference -->
<DockPanel LastChildFill="False" ToolTip.Tip="{Binding LocalizationManager.RateLimitPreferenceTooltip}">
<TextBlock DockPanel.Dock="Left" Text="{Binding LocalizationManager.RateLimitPreferenceLabel}" />
<DockPanel
LastChildFill="False"
ToolTip.Tip="{Binding LocalizationManager.RateLimitPreferenceTooltip}"
>
<TextBlock
DockPanel.Dock="Left"
Text="{Binding LocalizationManager.RateLimitPreferenceLabel}"
/>
<ComboBox
Width="150"
DockPanel.Dock="Right"
ItemsSource="{Binding AvailableRateLimitPreferences}"
SelectedItem="{Binding RateLimitPreference}">
SelectedItem="{Binding RateLimitPreference}"
>
<ComboBox.ItemTemplate>
<DataTemplate>
<TextBlock Text="{Binding Converter={x:Static converters:RateLimitPreferenceToStringConverter.Instance}}" />
@@ -82,23 +99,34 @@
</DockPanel>
<!-- Thread inclusion mode -->
<DockPanel LastChildFill="False" ToolTip.Tip="{Binding LocalizationManager.ShowThreadsTooltip}">
<TextBlock DockPanel.Dock="Left" Text="{Binding LocalizationManager.ShowThreadsLabel}" />
<DockPanel
LastChildFill="False"
ToolTip.Tip="{Binding LocalizationManager.ShowThreadsTooltip}"
>
<TextBlock
DockPanel.Dock="Left"
Text="{Binding LocalizationManager.ShowThreadsLabel}"
/>
<ComboBox
Width="150"
DockPanel.Dock="Right"
ItemsSource="{Binding AvailableThreadInclusionModes}"
SelectedItem="{Binding ThreadInclusionMode}" />
SelectedItem="{Binding ThreadInclusionMode}"
/>
</DockPanel>
<!-- Locale -->
<DockPanel LastChildFill="False" ToolTip.Tip="{Binding LocalizationManager.LocaleTooltip}">
<DockPanel
LastChildFill="False"
ToolTip.Tip="{Binding LocalizationManager.LocaleTooltip}"
>
<TextBlock DockPanel.Dock="Left" Text="{Binding LocalizationManager.LocaleLabel}" />
<ComboBox
Width="150"
DockPanel.Dock="Right"
ItemsSource="{Binding AvailableLocales}"
SelectedItem="{Binding Locale}">
SelectedItem="{Binding Locale}"
>
<ComboBox.ItemTemplate>
<DataTemplate>
<TextBlock Text="{Binding Converter={x:Static converters:LocaleToDisplayNameStringConverter.Instance}}" />
@@ -108,18 +136,27 @@
</DockPanel>
<!-- UTC normalization -->
<DockPanel LastChildFill="False" ToolTip.Tip="{Binding LocalizationManager.NormalizeToUtcTooltip}">
<TextBlock DockPanel.Dock="Left" Text="{Binding LocalizationManager.NormalizeToUtcLabel}" />
<DockPanel
LastChildFill="False"
ToolTip.Tip="{Binding LocalizationManager.NormalizeToUtcTooltip}"
>
<TextBlock
DockPanel.Dock="Left"
Text="{Binding LocalizationManager.NormalizeToUtcLabel}"
/>
<ToggleSwitch DockPanel.Dock="Right" IsChecked="{Binding IsUtcNormalizationEnabled}" />
</DockPanel>
<!-- Parallel limit -->
<DockPanel LastChildFill="False" ToolTip.Tip="{Binding LocalizationManager.ParallelLimitTooltip}">
<TextBlock DockPanel.Dock="Left" Text="{Binding LocalizationManager.ParallelLimitLabel}" />
<StackPanel
DockPanel.Dock="Right"
Orientation="Horizontal"
Spacing="10">
<DockPanel
LastChildFill="False"
ToolTip.Tip="{Binding LocalizationManager.ParallelLimitTooltip}"
>
<TextBlock
DockPanel.Dock="Left"
Text="{Binding LocalizationManager.ParallelLimitLabel}"
/>
<StackPanel DockPanel.Dock="Right" Orientation="Horizontal" Spacing="10">
<TextBlock Text="{Binding ParallelLimit}" />
<Slider
Width="150"
@@ -127,7 +164,8 @@
Maximum="10"
Minimum="1"
TickFrequency="1"
Value="{Binding ParallelLimit}" />
Value="{Binding ParallelLimit}"
/>
</StackPanel>
</DockPanel>
</StackPanel>
@@ -143,6 +181,7 @@
Content="{Binding LocalizationManager.CloseButton}"
IsCancel="True"
IsDefault="True"
Theme="{DynamicResource MaterialOutlineButton}" />
Theme="{DynamicResource MaterialOutlineButton}"
/>
</Grid>
</UserControl>
+2 -1
View File
@@ -13,7 +13,8 @@
x:DataType="viewModels:MainViewModel"
Icon="/favicon.ico"
RenderOptions.BitmapInterpolationMode="HighQuality"
WindowStartupLocation="CenterScreen">
WindowStartupLocation="CenterScreen"
>
<dialogHostAvalonia:DialogHost x:Name="DialogHost" CloseOnClickAway="False">
<materialStyles:SnackbarHost HostName="Root" SnackbarMaxCounts="3">
<ContentControl Content="{Binding Dashboard}" />