javier/Wino-Mail
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed tooltips

Browse Source
This commit is contained in:
Aleh Khantsevich
2024-06-13 03:13:53 +02:00
parent 5242e55826
commit fedf5d2203
2 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
Wino.Mail/Dialogs/SignatureEditorDialog.xaml
View File

@@ -37,7 +37,6 @@
MinWidth="300" MinWidth="300"
MaxWidth="500" MaxWidth="500"
HorizontalAlignment="Left" HorizontalAlignment="Left"
Header="{x:Bind SignatureNameHeader}"
PlaceholderText="{x:Bind domain:Translator.SignatureEditorDialog_SignatureName_Placeholder}" PlaceholderText="{x:Bind domain:Translator.SignatureEditorDialog_SignatureName_Placeholder}"
TextChanged="SignatureNameTextBoxTextChanged" /> TextChanged="SignatureNameTextBoxTextChanged" />
@@ -57,9 +56,10 @@
Width="48" Width="48"
Click="InvertComposerThemeClicked" Click="InvertComposerThemeClicked"
LabelPosition="Collapsed" LabelPosition="Collapsed"
ToolTipService.ToolTip="Light Theme"
Visibility="{x:Bind IsComposerDarkMode, Mode=OneWay}"> Visibility="{x:Bind IsComposerDarkMode, Mode=OneWay}">
<AppBarButton.Icon> <AppBarButton.Icon>
<controls:WinoFontIcon Icon="DarkEditor" /> <controls:WinoFontIcon Icon="LightEditor" />
</AppBarButton.Icon> </AppBarButton.Icon>
</AppBarButton> </AppBarButton>
@@ -67,9 +67,10 @@
Width="48" Width="48"
Click="InvertComposerThemeClicked" Click="InvertComposerThemeClicked"
LabelPosition="Collapsed" LabelPosition="Collapsed"
ToolTipService.ToolTip="Dark Theme"
Visibility="{x:Bind IsComposerDarkMode, Mode=OneWay, Converter={StaticResource ReverseBooleanToVisibilityConverter}}"> Visibility="{x:Bind IsComposerDarkMode, Mode=OneWay, Converter={StaticResource ReverseBooleanToVisibilityConverter}}">
<AppBarButton.Icon> <AppBarButton.Icon>
<controls:WinoFontIcon Icon="LightEditor" /> <controls:WinoFontIcon Icon="DarkEditor" />
</AppBarButton.Icon> </AppBarButton.Icon>
</AppBarButton> </AppBarButton>
@@ -120,8 +121,8 @@
x:Name="BulletListButton" x:Name="BulletListButton"
Width="48" Width="48"
Click="BulletListButtonClicked" Click="BulletListButtonClicked"
Label="Stroke" Label="Bullet List"
ToolTipService.ToolTip="Stroke"> ToolTipService.ToolTip="Bullet List">
<AppBarToggleButton.Icon> <AppBarToggleButton.Icon>
<PathIcon Data="{StaticResource BulletedListPathIcon}" /> <PathIcon Data="{StaticResource BulletedListPathIcon}" />
</AppBarToggleButton.Icon> </AppBarToggleButton.Icon>
@@ -130,8 +131,8 @@
x:Name="OrderedListButton" x:Name="OrderedListButton"
Width="48" Width="48"
Click="OrderedListButtonClicked" Click="OrderedListButtonClicked"
Label="Stroke" Label="Ordered List"
ToolTipService.ToolTip="Stroke"> ToolTipService.ToolTip="Ordered List">
<AppBarToggleButton.Icon> <AppBarToggleButton.Icon>
<PathIcon Data="{StaticResource OrderedListPathIcon}" /> <PathIcon Data="{StaticResource OrderedListPathIcon}" />
</AppBarToggleButton.Icon> </AppBarToggleButton.Icon>
@@ -140,8 +141,8 @@
x:Name="DecreaseIndentButton" x:Name="DecreaseIndentButton"
Width="48" Width="48"
Click="DecreaseIndentClicked" Click="DecreaseIndentClicked"
Label="Stroke" Label="Decrease Indent"
ToolTipService.ToolTip="Stroke"> ToolTipService.ToolTip="Decrease Indent">
<AppBarButton.Icon> <AppBarButton.Icon>
<PathIcon Data="{StaticResource DecreaseIndentPathIcon}" /> <PathIcon Data="{StaticResource DecreaseIndentPathIcon}" />
</AppBarButton.Icon> </AppBarButton.Icon>
@@ -150,8 +151,8 @@
x:Name="IncreaseIndentButton" x:Name="IncreaseIndentButton"
Width="48" Width="48"
Click="IncreaseIndentClicked" Click="IncreaseIndentClicked"
Label="Stroke" Label="Increase Indent"
ToolTipService.ToolTip="Stroke"> ToolTipService.ToolTip="Increase Indent">
<AppBarButton.Icon> <AppBarButton.Icon>
<PathIcon Data="{StaticResource IncreaseIndentPathIcon}" /> <PathIcon Data="{StaticResource IncreaseIndentPathIcon}" />
</AppBarButton.Icon> </AppBarButton.Icon>
@@ -161,7 +162,9 @@
<AppBarToggleButton <AppBarToggleButton
x:Name="DirectionButton" x:Name="DirectionButton"
Width="48" Width="48"
Click="DirectionButtonClicked"> Click="DirectionButtonClicked"
Label="Direction"
ToolTipService.ToolTip="Direction">
<AppBarToggleButton.Icon> <AppBarToggleButton.Icon>
<PathIcon Data="{StaticResource ParagraphPathIcon}" /> <PathIcon Data="{StaticResource ParagraphPathIcon}" />
</AppBarToggleButton.Icon> </AppBarToggleButton.Icon>
@@ -211,6 +214,7 @@
x:Name="AddImageButton" x:Name="AddImageButton"
Width="48" Width="48"
Click="AddImageClicked" Click="AddImageClicked"
Label="Add Image"
ToolTipService.ToolTip="{x:Bind domain:Translator.Photos}"> ToolTipService.ToolTip="{x:Bind domain:Translator.Photos}">
<AppBarButton.Icon> <AppBarButton.Icon>
<PathIcon Data="{StaticResource AddPhotoPathIcon}" /> <PathIcon Data="{StaticResource AddPhotoPathIcon}" />
@@ -228,6 +232,7 @@
x:Name="EmojiButton" x:Name="EmojiButton"
Width="48" Width="48"
Click="EmojiButtonClicked" Click="EmojiButtonClicked"
Label="Add Emoji"
ToolTipService.ToolTip="{x:Bind domain:Translator.Emoji}"> ToolTipService.ToolTip="{x:Bind domain:Translator.Emoji}">
<AppBarButton.Icon> <AppBarButton.Icon>
<PathIcon Data="{StaticResource EmojiPathIcon}" /> <PathIcon Data="{StaticResource EmojiPathIcon}" />
@@ -236,9 +241,8 @@
<AppBarButton <AppBarButton
x:Name="LinkButton" x:Name="LinkButton"
Width="48" Width="48"
Click="HyperlinkAddClicked" Label="Add HyperLink"
Label="Add Link" ToolTipService.ToolTip="Add HyperLink">
ToolTipService.ToolTip="{x:Bind domain:Translator.AddHyperlink}">
<AppBarButton.Flyout> <AppBarButton.Flyout>
<Flyout x:Name="HyperlinkFlyout"> <Flyout x:Name="HyperlinkFlyout">
<StackPanel Width="250" Spacing="6"> <StackPanel Width="250" Spacing="6">

6
Wino.Mail/Dialogs/SignatureEditorDialog.xaml.cs
View File

@@ -20,7 +20,6 @@ namespace Wino.Dialogs
private Func<Task<string>> _getHTMLBodyFunction; private Func<Task<string>> _getHTMLBodyFunction;
private readonly TaskCompletionSource<bool> _domLoadedTask = new TaskCompletionSource<bool>(); private readonly TaskCompletionSource<bool> _domLoadedTask = new TaskCompletionSource<bool>();
private readonly INativeAppService _nativeAppService = App.Current.Services.GetService<INativeAppService>(); private readonly INativeAppService _nativeAppService = App.Current.Services.GetService<INativeAppService>();
public string SignatureNameHeader { get; set; }
public AccountSignature Result; public AccountSignature Result;
public bool IsComposerDarkMode public bool IsComposerDarkMode
@@ -35,7 +34,7 @@ namespace Wino.Dialogs
{ {
InitializeComponent(); InitializeComponent();
SignatureNameHeader = Translator.SignatureEditorDialog_SignatureName_TitleNew; SignatureNameTextBox.Header = Translator.SignatureEditorDialog_SignatureName_TitleNew;
Environment.SetEnvironmentVariable("WEBVIEW2_DEFAULT_BACKGROUND_COLOR", "00FFFFFF"); Environment.SetEnvironmentVariable("WEBVIEW2_DEFAULT_BACKGROUND_COLOR", "00FFFFFF");
Environment.SetEnvironmentVariable("WEBVIEW2_ADDITIONAL_BROWSER_ARGUMENTS", "--enable-features=OverlayScrollbar,OverlayScrollbarWinStyle,OverlayScrollbarWinStyleAnimation"); Environment.SetEnvironmentVariable("WEBVIEW2_ADDITIONAL_BROWSER_ARGUMENTS", "--enable-features=OverlayScrollbar,OverlayScrollbarWinStyle,OverlayScrollbarWinStyleAnimation");
@@ -47,7 +46,8 @@ namespace Wino.Dialogs
{ {
InitializeComponent(); InitializeComponent();
SignatureNameHeader = string.Format(Translator.SignatureEditorDialog_SignatureName_TitleEdit, signatureModel.Name); SignatureNameTextBox.Text = signatureModel.Name.Trim();
SignatureNameTextBox.Header = string.Format(Translator.SignatureEditorDialog_SignatureName_TitleEdit, signatureModel.Name);
Result = new AccountSignature Result = new AccountSignature
{ {