Added no subject handler (#451)

* Added no subject handler
changed text trimming for address to CharacterEllipsis

* Make email subject selectable.
This commit is contained in:
Tiktack
2024-11-03 15:44:39 +01:00
committed by GitHub
parent d8885b089a
commit a1517f82bc
5 changed files with 12 additions and 5 deletions

View File

@@ -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"
}

View File

@@ -3082,5 +3082,10 @@ namespace Wino.Core.Domain
/// connecting
/// </summary>
public static string TitleBarServerReconnectingButton_Title => Resources.GetTranslatedString(@"TitleBarServerReconnectingButton_Title");
/// <summary>
/// No subject
/// </summary>
public static string MailItemNoSubject => Resources.GetTranslatedString(@"MailItemNoSubject");
}
}

View File

@@ -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)}" />
<!-- Hover button -->
@@ -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" />
<TextBlock

View File

@@ -57,6 +57,7 @@ namespace Wino.Helpers
return prefer24HourTime ? localTime.ToString(TwentyFourHourTimeFormat) : localTime.ToString(TwelveHourTimeFormat);
}
}
public static string GetMailItemSubject(string subject) => string.IsNullOrWhiteSpace(subject) ? $"({Translator.MailItemNoSubject})" : subject;
public static string GetCreationDateString(DateTime date, bool prefer24HourTime)
{
var localTime = date.ToLocalTime();

View File

@@ -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" />
<HyperlinkButton