OUT-430: Move subject encryption option to Compatibility section
authorThomas
Tue, 10 Apr 2018 11:45:38 +0200
changeset 21040f53d8cc2d82
parent 2103 5cb6b52dd671
child 2105 ecd44ebb48e0
child 2109 5b0c92cceb00
child 2110 0dee7a3322e6
OUT-430: Move subject encryption option to Compatibility section
UI/FormControlOptions.xaml
     1.1 --- a/UI/FormControlOptions.xaml	Tue Apr 10 11:42:50 2018 +0200
     1.2 +++ b/UI/FormControlOptions.xaml	Tue Apr 10 11:45:38 2018 +0200
     1.3 @@ -314,26 +314,10 @@
     1.4                              <RowDefinition Height="Auto" />
     1.5                              <RowDefinition Height="Auto" />
     1.6                              <RowDefinition Height="Auto" />
     1.7 -                            <RowDefinition Height="Auto" />
     1.8                          </Grid.RowDefinitions>
     1.9                          <CheckBox Grid.Row="0"
    1.10                                    VerticalContentAlignment="Top"
    1.11                                    IsThreeState="False"
    1.12 -                                  IsChecked="{Binding Path=IsUnencryptedSubjectEnabled, Mode=TwoWay}"
    1.13 -                                  Visibility="{Binding Path=ReleaseMode, Mode=OneWay, Converter={StaticResource IsReleaseModeToVisibility}, ConverterParameter='Standard'}">
    1.14 -                            <CheckBox.Margin>
    1.15 -                                <Thickness Bottom="0"
    1.16 -                                           Left="0"
    1.17 -                                           Right="0"
    1.18 -                                           Top="{StaticResource PageSubSectionSpacing}" />
    1.19 -                            </CheckBox.Margin>
    1.20 -                            <TextBlock Text="{Binding Path=IsUnencryptedSubjectEnabledText, FallbackValue='Enable unprotected message subjects'}"
    1.21 -                                       TextWrapping="Wrap"
    1.22 -                                       Margin="{StaticResource CheckBoxContentMarginWhenTop}" />
    1.23 -                        </CheckBox>
    1.24 -                        <CheckBox Grid.Row="1"
    1.25 -                                  VerticalContentAlignment="Top"
    1.26 -                                  IsThreeState="False"
    1.27                                    IsChecked="{Binding Path=IsPEPFolderVisible, Mode=TwoWay}"
    1.28                                    Visibility="{Binding Path=IsAdvancedEnabled, Mode=OneWay, Converter={StaticResource BoolToVisibility}}">
    1.29                              <CheckBox.Margin>
    1.30 @@ -346,7 +330,7 @@
    1.31                                         TextWrapping="Wrap"
    1.32                                         Margin="{StaticResource CheckBoxContentMarginWhenTop}" />
    1.33                          </CheckBox>
    1.34 -                        <CheckBox Grid.Row="2"
    1.35 +                        <CheckBox Grid.Row="1"
    1.36                                    VerticalContentAlignment="Top"
    1.37                                    IsThreeState="False"
    1.38                                    IsChecked="{Binding Path=IsSecurityLossWarningEnabled, Mode=TwoWay}">
    1.39 @@ -368,7 +352,7 @@
    1.40                                         TextWrapping="Wrap"
    1.41                                         Margin="{StaticResource CheckBoxContentMarginWhenTop}" />
    1.42                          </CheckBox>
    1.43 -                        <CheckBox Grid.Row="3"
    1.44 +                        <CheckBox Grid.Row="2"
    1.45                                    VerticalContentAlignment="Top"
    1.46                                    IsThreeState="False"
    1.47                                    IsChecked="{Binding Path=IsNeverUnsecureOptionVisible, Mode=TwoWay}">
    1.48 @@ -390,7 +374,7 @@
    1.49                                         TextWrapping="Wrap"
    1.50                                         Margin="{StaticResource CheckBoxContentMarginWhenTop}" />
    1.51                          </CheckBox>
    1.52 -                        <ComboBox Grid.Row="4"
    1.53 +                        <ComboBox Grid.Row="3"
    1.54                                    ItemsSource="{Binding Path=TrustwordsCultureList}"
    1.55                                    DisplayMemberPath="Value"
    1.56                                    SelectedValuePath="Key"
    1.57 @@ -417,6 +401,7 @@
    1.58                          <RowDefinition Height="Auto" />
    1.59                          <RowDefinition Height="Auto" />
    1.60                          <RowDefinition Height="Auto" />
    1.61 +                        <RowDefinition Height="Auto" />
    1.62                          <RowDefinition Height="*" />
    1.63                      </Grid.RowDefinitions>
    1.64  
    1.65 @@ -428,13 +413,30 @@
    1.66                                 FontSize="16" />
    1.67                      <Separator Grid.Row="1" />
    1.68  
    1.69 +                    <!--Unprotected subject-->
    1.70 +                    <CheckBox Grid.Row="2"
    1.71 +                              VerticalContentAlignment="Top"
    1.72 +                              IsThreeState="False"
    1.73 +                              IsChecked="{Binding Path=IsUnencryptedSubjectEnabled, Mode=TwoWay}"
    1.74 +                              Visibility="{Binding Path=ReleaseMode, Mode=OneWay, Converter={StaticResource IsReleaseModeToVisibility}, ConverterParameter='Standard'}">
    1.75 +                        <CheckBox.Margin>
    1.76 +                            <Thickness Bottom="0"
    1.77 +                                       Left="{StaticResource PageLeftSpacing}"
    1.78 +                                       Right="0"
    1.79 +                                       Top="{StaticResource PageTopSpacing}" />
    1.80 +                        </CheckBox.Margin>
    1.81 +                        <TextBlock Text="{Binding Path=IsUnencryptedSubjectEnabledText, FallbackValue='Enable unprotected message subjects'}"
    1.82 +                                   TextWrapping="Wrap"
    1.83 +                                   Margin="{StaticResource CheckBoxContentMarginWhenTop}" />
    1.84 +                    </CheckBox>
    1.85 +
    1.86                      <!-- Key management -->
    1.87 -                    <StackPanel Grid.Row="2">
    1.88 +                    <StackPanel Grid.Row="3">
    1.89                          <StackPanel.Margin>
    1.90                              <Thickness Bottom="0"
    1.91                                         Left="{StaticResource PageLeftSpacing}"
    1.92                                         Right="0"
    1.93 -                                       Top="{StaticResource PageTopSpacing}" />
    1.94 +                                       Top="{StaticResource PageSubSectionSpacing}" />
    1.95                          </StackPanel.Margin>
    1.96                          <CheckBox VerticalContentAlignment="Center"
    1.97                                    IsThreeState="False"
    1.98 @@ -457,7 +459,7 @@
    1.99                      </StackPanel>
   1.100  
   1.101                      <!-- Key blacklist title -->
   1.102 -                    <TextBlock Grid.Row="3"
   1.103 +                    <TextBlock Grid.Row="4"
   1.104                                 Text="{Binding Path=PageSectionBlacklistText, FallbackValue='Key Blacklist'}"
   1.105                                 FontWeight="Bold"
   1.106                                 FontSize="16">
   1.107 @@ -476,7 +478,7 @@
   1.108                                         Top="{StaticResource PageSectionSpacing}" />
   1.109                          </TextBlock.Margin>
   1.110                      </TextBlock>
   1.111 -                    <Separator Grid.Row="4">
   1.112 +                    <Separator Grid.Row="5">
   1.113                          <Separator.Visibility>
   1.114                              <MultiBinding Converter="{StaticResource MultiBooleanToVisibility}">
   1.115                                  <Binding Path="ReleaseMode"
   1.116 @@ -488,7 +490,7 @@
   1.117                      </Separator>
   1.118  
   1.119                      <!-- Blacklist -->
   1.120 -                    <Grid Grid.Row="5">
   1.121 +                    <Grid Grid.Row="6">
   1.122                          <Grid.Visibility>
   1.123                              <MultiBinding Converter="{StaticResource MultiBooleanToVisibility}">
   1.124                                  <Binding Path="ReleaseMode"