From a1517f82bc6dded33b0ab503dd1409c14d5eb2e7 Mon Sep 17 00:00:00 2001 From: Tiktack Date: Sun, 3 Nov 2024 15:44:39 +0100 Subject: [PATCH] Added no subject handler (#451) * Added no subject handler changed text trimming for address to CharacterEllipsis * Make email subject selectable. --- Wino.Core.Domain/Translations/en_US/resources.json | 4 ++-- Wino.Core.Domain/Translator.Designer.cs | 5 +++++ Wino.Mail/Controls/MailItemDisplayInformationControl.xaml | 4 ++-- Wino.Mail/Helpers/XamlHelpers.cs | 1 + Wino.Mail/Views/MailRenderingPage.xaml | 3 ++- 5 files changed, 12 insertions(+), 5 deletions(-) diff --git a/Wino.Core.Domain/Translations/en_US/resources.json b/Wino.Core.Domain/Translations/en_US/resources.json index b190a618..0420f72d 100644 --- a/Wino.Core.Domain/Translations/en_US/resources.json +++ b/Wino.Core.Domain/Translations/en_US/resources.json @@ -611,6 +611,6 @@ "TitleBarServerDisconnectedButton_Title": "no connection", "TitleBarServerDisconnectedButton_Description": "Wino is disconnected from the network. Click reconnect to restore connection.", "TitleBarServerReconnectButton_Title": "reconnect", - "TitleBarServerReconnectingButton_Title": "connecting" - + "TitleBarServerReconnectingButton_Title": "connecting", + "MailItemNoSubject": "No subject" } diff --git a/Wino.Core.Domain/Translator.Designer.cs b/Wino.Core.Domain/Translator.Designer.cs index 2a1dbcaa..2f7800fe 100644 --- a/Wino.Core.Domain/Translator.Designer.cs +++ b/Wino.Core.Domain/Translator.Designer.cs @@ -3082,5 +3082,10 @@ namespace Wino.Core.Domain /// connecting /// public static string TitleBarServerReconnectingButton_Title => Resources.GetTranslatedString(@"TitleBarServerReconnectingButton_Title"); + + /// + /// No subject + /// + public static string MailItemNoSubject => Resources.GetTranslatedString(@"MailItemNoSubject"); } } diff --git a/Wino.Mail/Controls/MailItemDisplayInformationControl.xaml b/Wino.Mail/Controls/MailItemDisplayInformationControl.xaml index d60d9602..c5f01fd5 100644 --- a/Wino.Mail/Controls/MailItemDisplayInformationControl.xaml +++ b/Wino.Mail/Controls/MailItemDisplayInformationControl.xaml @@ -119,7 +119,7 @@ x:Name="SenderTextFromAddress" Grid.Column="1" Text="{x:Bind MailItem.FromAddress}" - TextTrimming="WordEllipsis" + TextTrimming="CharacterEllipsis" Visibility="{x:Bind helpers:XamlHelpers.StringToVisibilityReversedConverter(MailItem.FromName)}" /> @@ -193,7 +193,7 @@ x:Name="TitleText" Grid.Column="1" MaxLines="1" - Text="{x:Bind MailItem.Subject}" + Text="{x:Bind helpers:XamlHelpers.GetMailItemSubject(MailItem.Subject)}" TextTrimming="CharacterEllipsis" /> string.IsNullOrWhiteSpace(subject) ? $"({Translator.MailItemNoSubject})" : subject; public static string GetCreationDateString(DateTime date, bool prefer24HourTime) { var localTime = date.ToLocalTime(); diff --git a/Wino.Mail/Views/MailRenderingPage.xaml b/Wino.Mail/Views/MailRenderingPage.xaml index dd95013d..3934ab63 100644 --- a/Wino.Mail/Views/MailRenderingPage.xaml +++ b/Wino.Mail/Views/MailRenderingPage.xaml @@ -179,7 +179,8 @@ VerticalAlignment="Center" FontSize="18" FontWeight="SemiBold" - Text="{x:Bind ViewModel.Subject, Mode=OneWay}" + IsTextSelectionEnabled="True" + Text="{x:Bind helpers:XamlHelpers.GetMailItemSubject( ViewModel.Subject), Mode=OneWay}" TextWrapping="Wrap" />