Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix chatdownload & chatupdate text spacing when switching to/from non-json formats #1067

Merged
merged 1 commit into from
May 18, 2024
Merged

Fix chatdownload & chatupdate text spacing when switching to/from non-json formats #1067

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion TwitchDownloaderWPF/PageChatDownload.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
<TextBlock Text="{lex:Loc Length}" HorizontalAlignment="Right" Foreground="{DynamicResource AppText}" />
<TextBlock Text="{lex:Loc DownloadFormat}" HorizontalAlignment="Right" Margin="0,12,0,0" Foreground="{DynamicResource AppText}" />
<TextBlock Visibility="Visible" x:Name="compressionText" Text="{lex:Loc ChatCompression}" HorizontalAlignment="Right" Margin="0,14,0,0" Foreground="{DynamicResource AppText}" />
<TextBlock Visibility="Collapsed" x:Name="timeText" Text="{lex:Loc TimestampFormat}" HorizontalAlignment="Right" Margin="0,8,0,0" Foreground="{DynamicResource AppText}" />
<TextBlock Visibility="Collapsed" x:Name="timeText" Text="{lex:Loc TimestampFormat}" HorizontalAlignment="Right" Margin="0,14,0,0" Foreground="{DynamicResource AppText}" />
<TextBlock x:Name="textTrim" Text="{lex:Loc TrimChat}" HorizontalAlignment="Right" Margin="0,10,0,33" Foreground="{DynamicResource AppText}" />
<StackPanel x:Name="stackEmbedText" Visibility="Visible">
<TextBlock HorizontalAlignment="Right" Margin="0,8,0,0" Foreground="{DynamicResource AppText}" ><Run Text="{lex:Loc EmbedImages}"/><Hyperlink ToolTipService.ShowDuration="30000" Foreground="{DynamicResource AppHyperlink}"><Hyperlink.ToolTip><Run Text="{lex:Loc EmbedImagesTooltip}"/></Hyperlink.ToolTip>(?)</Hyperlink>:</TextBlock>
Expand Down
6 changes: 3 additions & 3 deletions TwitchDownloaderWPF/PageChatDownload.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@ private void radioJson_Checked(object sender, RoutedEventArgs e)
stackEmbedChecks.Visibility = Visibility.Visible;
compressionText.Visibility = Visibility.Visible;
compressionOptions.Visibility = Visibility.Visible;
textTrim.Margin = new Thickness(0, 12, 0, 36);
textTrim.Margin = new Thickness(0, 10, 0, 33);

Settings.Default.ChatDownloadType = (int)ChatFormat.Json;
Settings.Default.Save();
Expand All @@ -417,7 +417,7 @@ private void radioHTML_Checked(object sender, RoutedEventArgs e)
stackEmbedChecks.Visibility = Visibility.Visible;
compressionText.Visibility = Visibility.Collapsed;
compressionOptions.Visibility = Visibility.Collapsed;
textTrim.Margin = new Thickness(0, 17, 0, 36);
textTrim.Margin = new Thickness(0, 17, 0, 33);

Settings.Default.ChatDownloadType = (int)ChatFormat.Html;
Settings.Default.Save();
Expand All @@ -434,7 +434,7 @@ private void radioText_Checked(object sender, RoutedEventArgs e)
stackEmbedChecks.Visibility = Visibility.Collapsed;
compressionText.Visibility = Visibility.Collapsed;
compressionOptions.Visibility = Visibility.Collapsed;
textTrim.Margin = new Thickness(0, 12, 0, 41);
textTrim.Margin = new Thickness(0, 10, 0, 36);

Settings.Default.ChatDownloadType = (int)ChatFormat.Text;
Settings.Default.Save();
Expand Down
2 changes: 1 addition & 1 deletion TwitchDownloaderWPF/PageChatUpdate.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
<TextBlock Text="{lex:Loc Length}" HorizontalAlignment="Right" Foreground="{DynamicResource AppText}" />
<TextBlock Text="{lex:Loc DownloadFormat}" HorizontalAlignment="Right" Margin="0,12,0,0" Foreground="{DynamicResource AppText}" />
<TextBlock Visibility="Visible" x:Name="compressionText" Text="{lex:Loc ChatCompression}" HorizontalAlignment="Right" Margin="0,14,0,0" Foreground="{DynamicResource AppText}" />
<TextBlock Visibility="Collapsed" x:Name="timeText" Text="{lex:Loc TimestampFormat}" HorizontalAlignment="Right" Margin="0,8,0,0" Foreground="{DynamicResource AppText}" />
<TextBlock Visibility="Collapsed" x:Name="timeText" Text="{lex:Loc TimestampFormat}" HorizontalAlignment="Right" Margin="0,14,0,0" Foreground="{DynamicResource AppText}" />
<TextBlock x:Name="textTrim" Text="{lex:Loc TrimChat}" HorizontalAlignment="Right" Margin="0,10,0,33" Foreground="{DynamicResource AppText}" />
<StackPanel x:Name="stackEmbedText" Visibility="Visible">
<TextBlock HorizontalAlignment="Right" Margin="0,8,0,0" Foreground="{DynamicResource AppText}" ><Run Text="{lex:Loc EmbedMissing}"/><Hyperlink ToolTipService.ShowDuration="30000" Foreground="{DynamicResource AppHyperlink}"><Hyperlink.ToolTip><Run Text="{lex:Loc EmbedMissingTooltip}"/></Hyperlink.ToolTip>(?)</Hyperlink>:</TextBlock>
Expand Down
6 changes: 3 additions & 3 deletions TwitchDownloaderWPF/PageChatUpdate.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -607,7 +607,7 @@ private void radioJson_Checked(object sender, RoutedEventArgs e)
stackEmbedChecks.Visibility = Visibility.Visible;
compressionText.Visibility = Visibility.Visible;
compressionOptions.Visibility = Visibility.Visible;
textTrim.Margin = new Thickness(0, 12, 0, 36);
textTrim.Margin = new Thickness(0, 10, 0, 33);

Settings.Default.ChatDownloadType = (int)ChatFormat.Json;
Settings.Default.Save();
Expand All @@ -624,7 +624,7 @@ private void radioHTML_Checked(object sender, RoutedEventArgs e)
stackEmbedChecks.Visibility = Visibility.Visible;
compressionText.Visibility = Visibility.Collapsed;
compressionOptions.Visibility = Visibility.Collapsed;
textTrim.Margin = new Thickness(0, 17, 0, 36);
textTrim.Margin = new Thickness(0, 17, 0, 33);

Settings.Default.ChatDownloadType = (int)ChatFormat.Html;
Settings.Default.Save();
Expand All @@ -641,7 +641,7 @@ private void radioText_Checked(object sender, RoutedEventArgs e)
stackEmbedChecks.Visibility = Visibility.Collapsed;
compressionText.Visibility = Visibility.Collapsed;
compressionOptions.Visibility = Visibility.Collapsed;
textTrim.Margin = new Thickness(0, 12, 0, 0);
textTrim.Margin = new Thickness(0, 10, 0, 0);

Settings.Default.ChatDownloadType = (int)ChatFormat.Text;
Settings.Default.Save();
Expand Down
Loading