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

Visual refresh of dialogs.

Browse Source
This commit is contained in:
Burak Kaan Köse
2026-03-06 11:22:12 +01:00
parent 1aaf4e8a7e
commit 24f7c26d60
20 changed files with 284 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Wino.Mail.WinUI/Dialogs/AccountCreationDialog.xaml
+1 -3
View File
@@ -7,11 +7,9 @@
xmlns:dialogs="using:Wino.Dialogs"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
Closing="DialogClosing"
CornerRadius="8"
Style="{StaticResource WinoDialogStyle}"
mc:Ignorable="d">
<!-- ContentDialogs do not support VSM. -->
<controls:AccountCreationDialogControl
VerticalAlignment="Center"
CancelClicked="CancelClicked"
Wino.Mail.WinUI/Dialogs/AccountPickerDialog.xaml
+15 -1
View File
@@ -11,14 +11,28 @@
Style="{StaticResource WinoDialogStyle}"
mc:Ignorable="d">
<ContentDialog.Resources>
<x:Double x:Key="ContentDialogMinWidth">360</x:Double>
</ContentDialog.Resources>
<ListView
Margin="0,8,0,0"
IsItemClickEnabled="True"
ItemClick="AccountClicked"
ItemsSource="{x:Bind AvailableAccounts}"
SelectionMode="None">
<ListView.ItemContainerStyle>
<Style BasedOn="{StaticResource DefaultListViewItemStyle}" TargetType="ListViewItem">
<Setter Property="Padding" Value="12,10" />
<Setter Property="CornerRadius" Value="4" />
<Setter Property="Margin" Value="0,2" />
</Style>
</ListView.ItemContainerStyle>
<ListView.ItemTemplate>
<DataTemplate x:DataType="shared:MailAccount">
<TextBlock Text="{x:Bind Address}" />
<TextBlock
Style="{ThemeResource BodyTextBlockStyle}"
Text="{x:Bind Address}" />
</DataTemplate>
</ListView.ItemTemplate>
</ListView>
Wino.Mail.WinUI/Dialogs/AccountReorderDialog.xaml
+83 -47
View File
@@ -11,7 +11,7 @@
xmlns:local="using:Wino.Dialogs"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:selectors="using:Wino.Selectors"
Title="Reorder Accounnts"
Title="Reorder Accounts"
Closed="DialogClosed"
DefaultButton="Secondary"
Opened="DialogOpened"
@@ -20,54 +20,82 @@
mc:Ignorable="d">
<ContentDialog.Resources>
<x:Double x:Key="ContentDialogMinWidth">420</x:Double>
<DataTemplate x:Key="RootAccountReorderTemplate" x:DataType="interfaces:IAccountProviderDetailViewModel">
<Grid Padding="12" ColumnSpacing="24">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<coreControls:WinoFontIcon
Grid.RowSpan="2"
VerticalAlignment="Center"
FontSize="24"
Icon="{x:Bind helpers:XamlHelpers.GetProviderIcon(ProviderDetail.Type, ProviderDetail.SpecialImapProvider)}" />
<TextBlock
Grid.Column="1"
FontWeight="SemiBold"
Text="{x:Bind StartupEntityTitle}" />
<TextBlock
Grid.Row="1"
Grid.Column="1"
Text="{x:Bind StartupEntityAddresses}" />
</Grid>
<Border
Padding="12"
Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
BorderThickness="1"
CornerRadius="6">
<Grid ColumnSpacing="12">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<FontIcon
VerticalAlignment="Center"
FontSize="16"
Glyph="&#xE700;"
Opacity="0.5" />
<coreControls:WinoFontIcon
Grid.Column="1"
VerticalAlignment="Center"
FontSize="24"
Icon="{x:Bind helpers:XamlHelpers.GetProviderIcon(ProviderDetail.Type, ProviderDetail.SpecialImapProvider)}" />
<StackPanel
Grid.Column="2"
VerticalAlignment="Center"
Spacing="2">
<TextBlock
Style="{ThemeResource BodyStrongTextBlockStyle}"
Text="{x:Bind StartupEntityTitle}" />
<TextBlock
Foreground="{ThemeResource TextFillColorSecondaryBrush}"
Style="{ThemeResource CaptionTextBlockStyle}"
Text="{x:Bind StartupEntityAddresses}" />
</StackPanel>
</Grid>
</Border>
</DataTemplate>
<DataTemplate x:Key="MergedAccountReorderTemplate" x:DataType="interfaces:IAccountProviderDetailViewModel">
<Grid Padding="12" ColumnSpacing="24">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<PathIcon
Grid.RowSpan="2"
VerticalAlignment="Center"
Data="F1 M 8.613281 17.5 C 8.75 17.942709 8.945312 18.359375 9.199219 18.75 L 4.921875 18.75 C 4.433594 18.75 3.966471 18.650717 3.520508 18.452148 C 3.074544 18.25358 2.683919 17.986654 2.348633 17.651367 C 2.013346 17.31608 1.746419 16.925455 1.547852 16.479492 C 1.349284 16.033529 1.25 15.566406 1.25 15.078125 L 1.25 4.921875 C 1.25 4.433594 1.349284 3.966473 1.547852 3.520508 C 1.746419 3.074545 2.013346 2.68392 2.348633 2.348633 C 2.683919 2.013348 3.074544 1.74642 3.520508 1.547852 C 3.966471 1.349285 4.433594 1.25 4.921875 1.25 L 15.078125 1.25 C 15.566406 1.25 16.033527 1.349285 16.479492 1.547852 C 16.925455 1.74642 17.31608 2.013348 17.651367 2.348633 C 17.986652 2.68392 18.25358 3.074545 18.452148 3.520508 C 18.650715 3.966473 18.75 4.433594 18.75 4.921875 L 18.75 6.572266 C 18.580729 6.344402 18.390299 6.132813 18.178711 5.9375 C 17.967121 5.742188 17.740885 5.566407 17.5 5.410156 L 17.5 4.951172 C 17.5 4.625651 17.433268 4.314779 17.299805 4.018555 C 17.16634 3.722332 16.987305 3.461914 16.762695 3.237305 C 16.538086 3.012695 16.277668 2.83366 15.981445 2.700195 C 15.685221 2.566732 15.374349 2.5 15.048828 2.5 L 4.951172 2.5 C 4.619141 2.5 4.303385 2.568359 4.003906 2.705078 C 3.704427 2.841797 3.44401 3.02409 3.222656 3.251953 C 3.001302 3.479818 2.825521 3.745117 2.695312 4.047852 C 2.565104 4.350587 2.5 4.66797 2.5 5 L 13.310547 5 C 12.60091 5.266928 11.998697 5.683594 11.503906 6.25 L 2.5 6.25 L 2.5 15.048828 C 2.5 15.38737 2.568359 15.704753 2.705078 16.000977 C 2.841797 16.297201 3.024088 16.55599 3.251953 16.777344 C 3.479818 16.998697 3.745117 17.174479 4.047852 17.304688 C 4.350586 17.434896 4.667969 17.5 5 17.5 Z M 18.125 9.443359 C 18.125 9.866537 18.040363 10.263672 17.871094 10.634766 C 17.701822 11.005859 17.473957 11.329753 17.1875 11.606445 C 16.901041 11.883139 16.56901 12.101237 16.191406 12.260742 C 15.813802 12.420248 15.416666 12.5 15 12.5 C 14.563802 12.5 14.1569 12.41862 13.779297 12.255859 C 13.401691 12.0931 13.071288 11.870117 12.788086 11.586914 C 12.504882 11.303711 12.2819 10.973308 12.119141 10.595703 C 11.95638 10.2181 11.875 9.811198 11.875 9.375 C 11.875 8.938803 11.95638 8.531901 12.119141 8.154297 C 12.2819 7.776693 12.504882 7.446289 12.788086 7.163086 C 13.071288 6.879883 13.401691 6.656901 13.779297 6.494141 C 14.1569 6.331381 14.563802 6.25 15 6.25 C 15.449218 6.25 15.864257 6.333008 16.245117 6.499023 C 16.625977 6.665039 16.956379 6.892904 17.236328 7.182617 C 17.516275 7.472331 17.734375 7.810873 17.890625 8.198242 C 18.046875 8.585612 18.125 9.000651 18.125 9.443359 Z M 20 16.25 C 20 16.666666 19.926758 17.049154 19.780273 17.397461 C 19.633789 17.745768 19.435221 18.058268 19.18457 18.334961 C 18.933918 18.611654 18.642578 18.854166 18.310547 19.0625 C 17.978516 19.270834 17.626953 19.444986 17.255859 19.584961 C 16.884766 19.724936 16.505533 19.829102 16.118164 19.897461 C 15.730794 19.96582 15.358072 20 15 20 C 14.654947 20 14.291992 19.96582 13.911133 19.897461 C 13.530273 19.829102 13.154297 19.726562 12.783203 19.589844 C 12.412109 19.453125 12.058919 19.282227 11.723633 19.077148 C 11.388346 18.87207 11.092122 18.632812 10.834961 18.359375 C 10.577799 18.085938 10.374349 17.779947 10.224609 17.441406 C 10.074869 17.102865 10 16.731771 10 16.328125 L 10 15.78125 C 10 15.501303 10.052083 15.237631 10.15625 14.990234 C 10.260416 14.742839 10.405273 14.526367 10.59082 14.34082 C 10.776367 14.155273 10.991211 14.010417 11.235352 13.90625 C 11.479492 13.802084 11.744791 13.75 12.03125 13.75 L 17.96875 13.75 C 18.248697 13.75 18.512369 13.803711 18.759766 13.911133 C 19.00716 14.018555 19.222004 14.163412 19.404297 14.345703 C 19.586588 14.527995 19.731445 14.742839 19.838867 14.990234 C 19.946289 15.237631 20 15.501303 20 15.78125 Z " />
<TextBlock
Grid.Column="1"
FontWeight="SemiBold"
Text="{x:Bind StartupEntityTitle}" />
<TextBlock
Grid.Row="1"
Grid.Column="1"
Text="{x:Bind StartupEntityAddresses}" />
</Grid>
<Border
Padding="12"
Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
BorderThickness="1"
CornerRadius="6">
<Grid ColumnSpacing="12">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<FontIcon
VerticalAlignment="Center"
FontSize="16"
Glyph="&#xE700;"
Opacity="0.5" />
<PathIcon
Grid.Column="1"
VerticalAlignment="Center"
Data="F1 M 8.613281 17.5 C 8.75 17.942709 8.945312 18.359375 9.199219 18.75 L 4.921875 18.75 C 4.433594 18.75 3.966471 18.650717 3.520508 18.452148 C 3.074544 18.25358 2.683919 17.986654 2.348633 17.651367 C 2.013346 17.31608 1.746419 16.925455 1.547852 16.479492 C 1.349284 16.033529 1.25 15.566406 1.25 15.078125 L 1.25 4.921875 C 1.25 4.433594 1.349284 3.966473 1.547852 3.520508 C 1.746419 3.074545 2.013346 2.68392 2.348633 2.348633 C 2.683919 2.013348 3.074544 1.74642 3.520508 1.547852 C 3.966471 1.349285 4.433594 1.25 4.921875 1.25 L 15.078125 1.25 C 15.566406 1.25 16.033527 1.349285 16.479492 1.547852 C 16.925455 1.74642 17.31608 2.013348 17.651367 2.348633 C 17.986652 2.68392 18.25358 3.074545 18.452148 3.520508 C 18.650715 3.966473 18.75 4.433594 18.75 4.921875 L 18.75 6.572266 C 18.580729 6.344402 18.390299 6.132813 18.178711 5.9375 C 17.967121 5.742188 17.740885 5.566407 17.5 5.410156 L 17.5 4.951172 C 17.5 4.625651 17.433268 4.314779 17.299805 4.018555 C 17.16634 3.722332 16.987305 3.461914 16.762695 3.237305 C 16.538086 3.012695 16.277668 2.83366 15.981445 2.700195 C 15.685221 2.566732 15.374349 2.5 15.048828 2.5 L 4.951172 2.5 C 4.619141 2.5 4.303385 2.568359 4.003906 2.705078 C 3.704427 2.841797 3.44401 3.02409 3.222656 3.251953 C 3.001302 3.479818 2.825521 3.745117 2.695312 4.047852 C 2.565104 4.350587 2.5 4.66797 2.5 5 L 13.310547 5 C 12.60091 5.266928 11.998697 5.683594 11.503906 6.25 L 2.5 6.25 L 2.5 15.048828 C 2.5 15.38737 2.568359 15.704753 2.705078 16.000977 C 2.841797 16.297201 3.024088 16.55599 3.251953 16.777344 C 3.479818 16.998697 3.745117 17.174479 4.047852 17.304688 C 4.350586 17.434896 4.667969 17.5 5 17.5 Z M 18.125 9.443359 C 18.125 9.866537 18.040363 10.263672 17.871094 10.634766 C 17.701822 11.005859 17.473957 11.329753 17.1875 11.606445 C 16.901041 11.883139 16.56901 12.101237 16.191406 12.260742 C 15.813802 12.420248 15.416666 12.5 15 12.5 C 14.563802 12.5 14.1569 12.41862 13.779297 12.255859 C 13.401691 12.0931 13.071288 11.870117 12.788086 11.586914 C 12.504882 11.303711 12.2819 10.973308 12.119141 10.595703 C 11.95638 10.2181 11.875 9.811198 11.875 9.375 C 11.875 8.938803 11.95638 8.531901 12.119141 8.154297 C 12.2819 7.776693 12.504882 7.446289 12.788086 7.163086 C 13.071288 6.879883 13.401691 6.656901 13.779297 6.494141 C 14.1569 6.331381 14.563802 6.25 15 6.25 C 15.449218 6.25 15.864257 6.333008 16.245117 6.499023 C 16.625977 6.665039 16.956379 6.892904 17.236328 7.182617 C 17.516275 7.472331 17.734375 7.810873 17.890625 8.198242 C 18.046875 8.585612 18.125 9.000651 18.125 9.443359 Z M 20 16.25 C 20 16.666666 19.926758 17.049154 19.780273 17.397461 C 19.633789 17.745768 19.435221 18.058268 19.18457 18.334961 C 18.933918 18.611654 18.642578 18.854166 18.310547 19.0625 C 17.978516 19.270834 17.626953 19.444986 17.255859 19.584961 C 16.884766 19.724936 16.505533 19.829102 16.118164 19.897461 C 15.730794 19.96582 15.358072 20 15 20 C 14.654947 20 14.291992 19.96582 13.911133 19.897461 C 13.530273 19.829102 13.154297 19.726562 12.783203 19.589844 C 12.412109 19.453125 12.058919 19.282227 11.723633 19.077148 C 11.388346 18.87207 11.092122 18.632812 10.834961 18.359375 C 10.577799 18.085938 10.374349 17.779947 10.224609 17.441406 C 10.074869 17.102865 10 16.731771 10 16.328125 L 10 15.78125 C 10 15.501303 10.052083 15.237631 10.15625 14.990234 C 10.260416 14.742839 10.405273 14.526367 10.59082 14.34082 C 10.776367 14.155273 10.991211 14.010417 11.235352 13.90625 C 11.479492 13.802084 11.744791 13.75 12.03125 13.75 L 17.96875 13.75 C 18.248697 13.75 18.512369 13.803711 18.759766 13.911133 C 19.00716 14.018555 19.222004 14.163412 19.404297 14.345703 C 19.586588 14.527995 19.731445 14.742839 19.838867 14.990234 C 19.946289 15.237631 20 15.501303 20 15.78125 Z " />
<StackPanel
Grid.Column="2"
VerticalAlignment="Center"
Spacing="2">
<TextBlock
Style="{ThemeResource BodyStrongTextBlockStyle}"
Text="{x:Bind StartupEntityTitle}" />
<TextBlock
Foreground="{ThemeResource TextFillColorSecondaryBrush}"
Style="{ThemeResource CaptionTextBlockStyle}"
Text="{x:Bind StartupEntityAddresses}" />
</StackPanel>
</Grid>
</Border>
</DataTemplate>
<selectors:AccountReorderTemplateSelector
@@ -81,5 +109,13 @@
CanReorderItems="True"
ItemTemplateSelector="{StaticResource AccountReorderTemplateSelector}"
ItemsSource="{x:Bind Accounts}"
SelectionMode="None" />
SelectionMode="None">
<ListView.ItemContainerStyle>
<Style TargetType="ListViewItem">
<Setter Property="Margin" Value="0,2" />
<Setter Property="Padding" Value="0" />
<Setter Property="HorizontalContentAlignment" Value="Stretch" />
</Style>
</ListView.ItemContainerStyle>
</ListView>
</ContentDialog>
Wino.Mail.WinUI/Dialogs/ContactEditDialog.xaml
+39 -32
View File
@@ -19,7 +19,7 @@
<x:Double x:Key="ContentDialogMaxWidth">400</x:Double>
</ContentDialog.Resources>
<StackPanel Spacing="16">
<StackPanel Spacing="20">
<!-- Contact Name -->
<TextBox
x:Name="ContactNameTextBox"
@@ -38,44 +38,51 @@
<StackPanel>
<TextBlock
Margin="0,0,0,8"
FontWeight="SemiBold"
Style="{ThemeResource BodyStrongTextBlockStyle}"
Text="{x:Bind domain:Translator.ContactEditDialog_PhotoSection, Mode=OneTime}" />
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Border
Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
BorderThickness="1"
CornerRadius="6"
Padding="16">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<PersonPicture
x:Name="ContactPhotoPersonPicture"
Grid.Column="0"
Width="64"
Height="64"
Margin="0,0,16,0" />
<PersonPicture
x:Name="ContactPhotoPersonPicture"
Grid.Column="0"
Width="64"
Height="64"
Margin="0,0,16,0" />
<StackPanel
Grid.Column="1"
VerticalAlignment="Center"
Spacing="8">
<Button
x:Name="ChoosePhotoButton"
Click="ChoosePhotoClicked"
Content="{x:Bind domain:Translator.ContactEditDialog_ChoosePhoto, Mode=OneTime}" />
<Button
x:Name="RemovePhotoButton"
Click="RemovePhotoClicked"
Content="{x:Bind domain:Translator.ContactEditDialog_RemovePhoto, Mode=OneTime}"
Visibility="Collapsed" />
</StackPanel>
</Grid>
<StackPanel
Grid.Column="1"
VerticalAlignment="Center"
Spacing="8">
<Button
x:Name="ChoosePhotoButton"
Click="ChoosePhotoClicked"
Content="{x:Bind domain:Translator.ContactEditDialog_ChoosePhoto, Mode=OneTime}" />
<Button
x:Name="RemovePhotoButton"
Click="RemovePhotoClicked"
Content="{x:Bind domain:Translator.ContactEditDialog_RemovePhoto, Mode=OneTime}"
Visibility="Collapsed" />
</StackPanel>
</Grid>
</Border>
</StackPanel>
<!-- Contact Status Info -->
<Border
x:Name="RootContactInfoBorder"
Padding="12,8"
Padding="16,12"
Background="{ThemeResource AccentFillColorDefaultBrush}"
CornerRadius="4"
CornerRadius="6"
Visibility="Collapsed">
<TextBlock
Foreground="{ThemeResource TextOnAccentFillColorPrimaryBrush}"
@@ -85,9 +92,9 @@
<Border
x:Name="OverriddenContactInfoBorder"
Padding="12,8"
Padding="16,12"
Background="{ThemeResource SystemFillColorCautionBrush}"
CornerRadius="4"
CornerRadius="6"
Visibility="Collapsed">
<TextBlock
Foreground="{ThemeResource TextFillColorPrimaryBrush}"
Wino.Mail.WinUI/Dialogs/CreateAccountAliasDialog.xaml
+5 -4
View File
@@ -19,12 +19,14 @@
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<TextBlock Style="{StaticResource CaptionTextBlockStyle}" Text="{x:Bind domain:Translator.CreateAccountAliasDialog_Description}" />
<TextBlock
Style="{ThemeResource BodyTextBlockStyle}"
Text="{x:Bind domain:Translator.CreateAccountAliasDialog_Description}" />
<StackPanel
Grid.Row="1"
Margin="0,20"
Spacing="8">
Margin="0,16"
Spacing="12">
<TextBox
x:Name="AliasTextBox"
Header="{x:Bind domain:Translator.CreateAccountAliasDialog_AliasAddress}"
@@ -37,4 +39,3 @@
</StackPanel>
</Grid>
</ContentDialog>
Wino.Mail.WinUI/Dialogs/CustomThemeBuilderDialog.xaml
+7 -2
View File
@@ -25,8 +25,12 @@
<x:Double x:Key="ContentDialogMaxHeight">756</x:Double>
</ContentDialog.Resources>
<StackPanel Spacing="6">
<TextBlock x:Name="ErrorTextBlock" Foreground="Gold" />
<StackPanel Spacing="8">
<muxc:InfoBar
x:Name="ErrorInfoBar"
IsClosable="False"
IsOpen="False"
Severity="Warning" />
<controls:SettingsCard Description="{x:Bind domain:Translator.CustomThemeBuilder_ThemeNameDescription}" Header="{x:Bind domain:Translator.CustomThemeBuilder_ThemeNameTitle}">
<controls:SettingsCard.HeaderIcon>
@@ -63,6 +67,7 @@
x:Name="PreviewAccentColorGrid"
Width="20"
Height="20"
CornerRadius="4"
Background="{ThemeResource SystemAccentColor}" />
</StackPanel>
</Button.Content>
Wino.Mail.WinUI/Dialogs/CustomThemeBuilderDialog.xaml.cs
+2 -1
View File
@@ -35,7 +35,8 @@ public sealed partial class CustomThemeBuilderDialog : ContentDialog
}
catch (Exception exception)
{
ErrorTextBlock.Text = exception.Message;
ErrorInfoBar.Message = exception.Message;
ErrorInfoBar.IsOpen = true;
}
finally
{
Wino.Mail.WinUI/Dialogs/KeyboardShortcutDialog.xaml
+28 -15
View File
@@ -24,7 +24,7 @@
</Grid.RowDefinitions>
<!-- Mail Operation -->
<StackPanel Grid.Row="0" Margin="0,0,0,16">
<StackPanel Grid.Row="0" Margin="0,0,0,20">
<TextBlock
Margin="0,0,0,4"
Style="{ThemeResource BodyStrongTextBlockStyle}"
@@ -44,7 +44,7 @@
</StackPanel>
<!-- Key Input -->
<StackPanel Grid.Row="1" Margin="0,0,0,16">
<StackPanel Grid.Row="1" Margin="0,0,0,20">
<TextBlock
Margin="0,0,0,4"
Style="{ThemeResource BodyStrongTextBlockStyle}"
@@ -56,31 +56,44 @@
PreviewKeyDown="KeyInputTextBox_PreviewKeyDown" />
<TextBlock
Margin="0,4,0,0"
Opacity="0.7"
Foreground="{ThemeResource TextFillColorSecondaryBrush}"
Style="{ThemeResource CaptionTextBlockStyle}"
Text="{x:Bind domain:Translator.KeyboardShortcuts_FocusArea}" />
</StackPanel>
<!-- Modifiers -->
<StackPanel Grid.Row="2" Margin="0,0,0,16">
<StackPanel Grid.Row="2" Margin="0,0,0,20">
<TextBlock
Margin="0,0,0,8"
Style="{ThemeResource BodyStrongTextBlockStyle}"
Text="{x:Bind domain:Translator.KeyboardShortcuts_Modifiers}" />
<StackPanel Orientation="Horizontal" Spacing="16">
<CheckBox Content="Ctrl" IsChecked="{x:Bind IsControlPressed, Mode=TwoWay}" />
<CheckBox Content="Alt" IsChecked="{x:Bind IsAltPressed, Mode=TwoWay}" />
<CheckBox Content="Shift" IsChecked="{x:Bind IsShiftPressed, Mode=TwoWay}" />
<CheckBox Content="Win" IsChecked="{x:Bind IsWindowsPressed, Mode=TwoWay}" />
</StackPanel>
<Border
Padding="16,12"
Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
BorderThickness="1"
CornerRadius="6">
<StackPanel Orientation="Horizontal" Spacing="16">
<CheckBox Content="Ctrl" IsChecked="{x:Bind IsControlPressed, Mode=TwoWay}" />
<CheckBox Content="Alt" IsChecked="{x:Bind IsAltPressed, Mode=TwoWay}" />
<CheckBox Content="Shift" IsChecked="{x:Bind IsShiftPressed, Mode=TwoWay}" />
<CheckBox Content="Win" IsChecked="{x:Bind IsWindowsPressed, Mode=TwoWay}" />
</StackPanel>
</Border>
</StackPanel>
<!-- Error Message -->
<TextBlock
x:Name="ErrorTextBlock"
<Border
x:Name="ErrorBorder"
Grid.Row="3"
Foreground="{ThemeResource SystemErrorTextColor}"
Style="{ThemeResource CaptionTextBlockStyle}"
Visibility="Collapsed" />
Padding="12,8"
Background="{ThemeResource SystemFillColorCriticalBackgroundBrush}"
CornerRadius="4"
Visibility="Collapsed">
<TextBlock
x:Name="ErrorTextBlock"
Foreground="{ThemeResource SystemErrorTextColor}"
Style="{ThemeResource CaptionTextBlockStyle}" />
</Border>
</Grid>
</ContentDialog>
Wino.Mail.WinUI/Dialogs/KeyboardShortcutDialog.xaml.cs
+3 -3
View File
@@ -48,7 +48,7 @@ public sealed partial class KeyboardShortcutDialog : ContentDialog
private void SaveClicked(ContentDialog sender, ContentDialogButtonClickEventArgs args)
{
// Clear any previous error
ErrorTextBlock.Visibility = Microsoft.UI.Xaml.Visibility.Collapsed;
ErrorBorder.Visibility = Microsoft.UI.Xaml.Visibility.Collapsed;
// Validate input
if (string.IsNullOrWhiteSpace(KeyInputTextBox.Text))
@@ -75,7 +75,7 @@ public sealed partial class KeyboardShortcutDialog : ContentDialog
private void KeyInputTextBox_PreviewKeyDown(object sender, KeyRoutedEventArgs e)
{
// Clear error when user starts typing
ErrorTextBlock.Visibility = Microsoft.UI.Xaml.Visibility.Collapsed;
ErrorBorder.Visibility = Microsoft.UI.Xaml.Visibility.Collapsed;
var key = e.Key.ToString();
@@ -111,7 +111,7 @@ public sealed partial class KeyboardShortcutDialog : ContentDialog
private void ShowError(string message)
{
ErrorTextBlock.Text = message;
ErrorTextBlock.Visibility = Microsoft.UI.Xaml.Visibility.Visible;
ErrorBorder.Visibility = Microsoft.UI.Xaml.Visibility.Visible;
}
private static List<MailOperationViewModel> GetAvailableMailOperations()
Wino.Mail.WinUI/Dialogs/MessageSourceDialog.xaml
+14 -5
View File
@@ -19,10 +19,19 @@
</ContentDialog.Resources>
<ScrollViewer HorizontalScrollBarVisibility="Disabled" HorizontalScrollMode="Disabled">
<TextBlock
MaxWidth="1000"
IsTextSelectionEnabled="True"
Text="{x:Bind MessageSource, Mode=OneWay}"
TextWrapping="Wrap" />
<Border
Padding="16"
Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
BorderThickness="1"
CornerRadius="6">
<TextBlock
MaxWidth="1000"
FontFamily="Consolas"
FontSize="12"
IsTextSelectionEnabled="True"
Text="{x:Bind MessageSource, Mode=OneWay}"
TextWrapping="Wrap" />
</Border>
</ScrollViewer>
</ContentDialog>
Wino.Mail.WinUI/Dialogs/MoveMailDialog.xaml
+16 -7
View File
@@ -26,11 +26,14 @@
<DataTemplate x:Key="FolderStructureMenuFlyoutItemTemplate" x:DataType="folders:IMailItemFolder">
<TreeViewItem IsExpanded="True" ItemsSource="{x:Bind ChildFolders}">
<StackPanel
Height="32"
Height="36"
Orientation="Horizontal"
Spacing="12">
Spacing="14">
<coreControls:WinoFontIcon FontSize="20" Icon="{x:Bind helpers:XamlHelpers.GetSpecialFolderPathIconGeometry(SpecialFolderType)}" />
<TextBlock VerticalAlignment="Center" Text="{x:Bind FolderName}" />
<TextBlock
VerticalAlignment="Center"
Style="{ThemeResource BodyTextBlockStyle}"
Text="{x:Bind FolderName}" />
</StackPanel>
</TreeViewItem>
</DataTemplate>
@@ -42,11 +45,17 @@
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<TextBlock
x:Name="InvalidFolderText"
<Border
Margin="0,0,0,6"
Foreground="{ThemeResource InfoBarWarningSeverityIconBackground}"
Visibility="Collapsed" />
Background="{ThemeResource SystemFillColorCautionBackgroundBrush}"
CornerRadius="4"
Padding="12,8"
Visibility="Collapsed"
x:Name="InvalidFolderBorder">
<TextBlock
x:Name="InvalidFolderText"
Foreground="{ThemeResource InfoBarWarningSeverityIconBackground}" />
</Border>
<TreeView
x:Name="FolderTreeView"
Wino.Mail.WinUI/Dialogs/MoveMailDialog.xaml.cs
+1 -1
View File
@@ -45,7 +45,7 @@ public sealed partial class MoveMailDialog : ContentDialog
if (!SelectedFolder.IsMoveTarget)
{
// Warn users for only proper mail folders. Not ghost folders.
InvalidFolderText.Visibility = Visibility.Visible;
InvalidFolderBorder.Visibility = Visibility.Visible;
InvalidFolderText.Text = string.Format(Translator.MoveMailDialog_InvalidFolderMessage, SelectedFolder.FolderName);
if (FolderTreeView.SelectedItem != null)
Wino.Mail.WinUI/Dialogs/NewAccountDialog.xaml
+25 -7
View File
@@ -22,22 +22,31 @@
<ContentDialog.Resources>
<DataTemplate x:Key="NewMailProviderTemplate" x:DataType="accounts:ProviderDetail">
<Grid Margin="0,8" Padding="6">
<Grid
Margin="0,4"
Padding="12,10"
Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
BorderThickness="1"
CornerRadius="6">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<Image
Width="35"
Height="35"
Width="32"
Height="32"
Source="{x:Bind ProviderImage}" />
<StackPanel
Grid.Column="1"
Margin="12,0"
VerticalAlignment="Center"
Spacing="2">
<TextBlock FontWeight="Bold" Text="{x:Bind Name}" />
<TextBlock Text="{x:Bind Description}" />
<TextBlock Style="{ThemeResource BodyStrongTextBlockStyle}" Text="{x:Bind Name}" />
<TextBlock
Foreground="{ThemeResource TextFillColorSecondaryBrush}"
Style="{ThemeResource CaptionTextBlockStyle}"
Text="{x:Bind Description}" />
</StackPanel>
</Grid>
</DataTemplate>
@@ -95,11 +104,20 @@
ItemTemplate="{StaticResource NewMailProviderTemplate}"
ItemsSource="{x:Bind Providers}"
SelectedItem="{x:Bind SelectedMailProvider, Mode=TwoWay}"
SelectionMode="Single" />
SelectionMode="Single">
<ListView.ItemContainerStyle>
<Style BasedOn="{StaticResource DefaultListViewItemStyle}" TargetType="ListViewItem">
<Setter Property="Margin" Value="0,2" />
<Setter Property="Padding" Value="0" />
<Setter Property="HorizontalContentAlignment" Value="Stretch" />
<Setter Property="CornerRadius" Value="6" />
</Style>
</ListView.ItemContainerStyle>
</ListView>
</Grid>
<!-- Known special IMAP login details. -->
<Grid RowSpacing="12" Visibility="{x:Bind IsSpecialImapServerPartVisible, Mode=OneWay}">
<Grid RowSpacing="16" Visibility="{x:Bind IsSpecialImapServerPartVisible, Mode=OneWay}">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
Wino.Mail.WinUI/Dialogs/PrintDialog.xaml
+16 -4
View File
@@ -17,7 +17,7 @@
Style="{StaticResource WinoDialogStyle}"
mc:Ignorable="d">
<StackPanel Margin="20" Spacing="16">
<StackPanel Spacing="20">
<!-- Printer Selection -->
<ComboBox
@@ -46,9 +46,21 @@
<!-- Print Options -->
<StackPanel Spacing="8">
<TextBlock Text="Options" />
<CheckBox Content="Print backgrounds" IsChecked="{x:Bind PrintSettings.ShouldPrintBackgrounds, Mode=TwoWay}" />
<CheckBox Content="Print headers and footers" IsChecked="{x:Bind PrintSettings.ShouldPrintHeaderAndFooter, Mode=TwoWay}" />
<TextBlock
Margin="0,0,0,8"
Style="{ThemeResource BodyStrongTextBlockStyle}"
Text="Options" />
<Border
Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
BorderThickness="1"
CornerRadius="6"
Padding="16,12">
<StackPanel Spacing="8">
<CheckBox Content="Print backgrounds" IsChecked="{x:Bind PrintSettings.ShouldPrintBackgrounds, Mode=TwoWay}" />
<CheckBox Content="Print headers and footers" IsChecked="{x:Bind PrintSettings.ShouldPrintHeaderAndFooter, Mode=TwoWay}" />
</StackPanel>
</Border>
</StackPanel>
</StackPanel>
</ContentDialog>
Wino.Mail.WinUI/Dialogs/SignatureEditorDialog.xaml
+3 -3
View File
@@ -28,7 +28,7 @@
<x:Double x:Key="ContentDialogMaxWidth">1200</x:Double>
</ContentDialog.Resources>
<Grid Margin="0,20,0,0" RowSpacing="30">
<Grid Margin="0,8,0,0" RowSpacing="24">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="*" MaxHeight="400" />
@@ -255,10 +255,10 @@
</CommandBar>
<Border
Grid.Row="1"
Margin="0,6,0,0"
Margin="0,8,0,0"
BorderBrush="{StaticResource CardStrokeColorDefaultBrush}"
BorderThickness="1"
CornerRadius="3">
CornerRadius="6">
<controls2:WebViewEditorControl x:Name="WebViewEditor" />
</Border>
</Grid>
Wino.Mail.WinUI/Dialogs/SystemFolderConfigurationDialog.xaml
+11 -5
View File
@@ -21,11 +21,11 @@
<ContentDialog.Resources>
<Style TargetType="ComboBox">
<Setter Property="Width" Value="100" />
<Setter Property="Width" Value="140" />
</Style>
</ContentDialog.Resources>
<ScrollViewer>
<Grid RowSpacing="12">
<Grid RowSpacing="16">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
@@ -41,7 +41,7 @@
Text="{x:Bind domain:Translator.SystemFolderConfigDialog_MessageSecondLine}" />
</TextBlock>
<StackPanel Grid.Row="1" Spacing="6">
<StackPanel Grid.Row="1" Spacing="8">
<controls1:SettingsCard
x:Name="SentCard"
Description="{x:Bind domain:Translator.SystemFolderConfigDialog_SentFolderDescription}"
@@ -92,9 +92,15 @@
<ComboBox ItemsSource="{x:Bind AvailableFolders}" SelectedItem="{x:Bind Junk, Mode=TwoWay}" />
</controls1:SettingsCard>
<TextBlock x:Name="ValidationErrorTextBlock" Foreground="{StaticResource SystemErrorTextColor}" />
<Border
x:Name="ValidationErrorBorder"
Background="{ThemeResource SystemFillColorCriticalBackgroundBrush}"
CornerRadius="4"
Padding="12,8"
Visibility="Collapsed">
<TextBlock x:Name="ValidationErrorTextBlock" Foreground="{StaticResource SystemErrorTextColor}" />
</Border>
</StackPanel>
</Grid>
</ScrollViewer>
</ContentDialog>
Wino.Mail.WinUI/Dialogs/SystemFolderConfigurationDialog.xaml.cs
+4
View File
@@ -46,6 +46,7 @@ public sealed partial class SystemFolderConfigurationDialog : ContentDialog
private void SaveClicked(ContentDialog sender, ContentDialogButtonClickEventArgs args)
{
ValidationErrorTextBlock!.Text = string.Empty;
ValidationErrorBorder.Visibility = Microsoft.UI.Xaml.Visibility.Collapsed;
var allSpecialFolders = new List<MailItemFolder?>()
{
@@ -58,6 +59,9 @@ public sealed partial class SystemFolderConfigurationDialog : ContentDialog
if (new HashSet<Guid>(allSpecialFolders.Where(a => a != null).Select(x => x!.Id)).Count != allSpecialFolders.Where(a => a != null).Count())
ValidationErrorTextBlock!.Text = Translator.SystemFolderConfigDialogValidation_DuplicateSystemFolders;
if (!string.IsNullOrEmpty(ValidationErrorTextBlock!.Text))
ValidationErrorBorder.Visibility = Microsoft.UI.Xaml.Visibility.Visible;
// Check if we can save.
if (string.IsNullOrEmpty(ValidationErrorTextBlock!.Text))
{
Wino.Mail.WinUI/Dialogs/TextInputDialog.xaml
+5 -2
View File
@@ -21,8 +21,11 @@
<x:Double x:Key="ContentDialogMaxHeight">756</x:Double>
</ContentDialog.Resources>
<StackPanel Spacing="12">
<TextBlock x:Name="DialogDescription" TextWrapping="Wrap" />
<StackPanel Spacing="16">
<TextBlock
x:Name="DialogDescription"
Style="{ThemeResource BodyTextBlockStyle}"
TextWrapping="Wrap" />
<TextBox x:Name="FolderTextBox" Text="{x:Bind CurrentInput, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
</StackPanel>
</ContentDialog>
Wino.Mail.WinUI/Dialogs/WhatIsNewDialog.xaml
+2 -1
View File
@@ -18,7 +18,7 @@
<x:Double x:Key="ContentDialogMaxHeight">700</x:Double>
</ContentDialog.Resources>
<Grid RowSpacing="12">
<Grid RowSpacing="16">
<Grid.RowDefinitions>
<RowDefinition Height="*" />
<RowDefinition Height="Auto" />
@@ -36,6 +36,7 @@
x:Name="GetStartedButton"
Click="OnGetStartedClicked"
Content="{x:Bind domain:Translator.WhatIsNew_GetStartedButton}"
Style="{StaticResource AccentButtonStyle}"
Visibility="Collapsed" />
</StackPanel>
</Grid>