Merge with default OUT-428
authorThomas
Tue, 10 Apr 2018 11:47:55 +0200
branchOUT-428
changeset 2105ecd44ebb48e0
parent 2102 3939ad287c0c
parent 2104 0f53d8cc2d82
child 2106 7ee0a280030d
Merge with default
pEpForOutlook.csproj
     1.1 --- a/Properties/AssemblyInfo.cs	Tue Apr 10 10:50:14 2018 +0200
     1.2 +++ b/Properties/AssemblyInfo.cs	Tue Apr 10 11:47:55 2018 +0200
     1.3 @@ -43,5 +43,5 @@
     1.4  // You can specify all the values or you can default the Build and Revision Numbers 
     1.5  // by using the '*' as shown below:
     1.6  // [assembly: AssemblyVersion("1.0.*")]
     1.7 -[assembly: AssemblyVersion("1.0.100.0")]
     1.8 -[assembly: AssemblyFileVersion("1.0.100.0")]
     1.9 +[assembly: AssemblyVersion("1.0.101.0")]
    1.10 +[assembly: AssemblyFileVersion("1.0.101.0")]
     2.1 --- a/UI/FormControlOptions.xaml	Tue Apr 10 10:50:14 2018 +0200
     2.2 +++ b/UI/FormControlOptions.xaml	Tue Apr 10 11:47:55 2018 +0200
     2.3 @@ -314,26 +314,10 @@
     2.4                              <RowDefinition Height="Auto" />
     2.5                              <RowDefinition Height="Auto" />
     2.6                              <RowDefinition Height="Auto" />
     2.7 -                            <RowDefinition Height="Auto" />
     2.8                          </Grid.RowDefinitions>
     2.9                          <CheckBox Grid.Row="0"
    2.10                                    VerticalContentAlignment="Top"
    2.11                                    IsThreeState="False"
    2.12 -                                  IsChecked="{Binding Path=IsUnencryptedSubjectEnabled, Mode=TwoWay}"
    2.13 -                                  Visibility="{Binding Path=ReleaseMode, Mode=OneWay, Converter={StaticResource IsReleaseModeToVisibility}, ConverterParameter='Standard'}">
    2.14 -                            <CheckBox.Margin>
    2.15 -                                <Thickness Bottom="0"
    2.16 -                                           Left="0"
    2.17 -                                           Right="0"
    2.18 -                                           Top="{StaticResource PageSubSectionSpacing}" />
    2.19 -                            </CheckBox.Margin>
    2.20 -                            <TextBlock Text="{Binding Path=IsUnencryptedSubjectEnabledText, FallbackValue='Enable unprotected message subjects'}"
    2.21 -                                       TextWrapping="Wrap"
    2.22 -                                       Margin="{StaticResource CheckBoxContentMarginWhenTop}" />
    2.23 -                        </CheckBox>
    2.24 -                        <CheckBox Grid.Row="1"
    2.25 -                                  VerticalContentAlignment="Top"
    2.26 -                                  IsThreeState="False"
    2.27                                    IsChecked="{Binding Path=IsPEPFolderVisible, Mode=TwoWay}"
    2.28                                    Visibility="{Binding Path=IsAdvancedEnabled, Mode=OneWay, Converter={StaticResource BoolToVisibility}}">
    2.29                              <CheckBox.Margin>
    2.30 @@ -346,7 +330,7 @@
    2.31                                         TextWrapping="Wrap"
    2.32                                         Margin="{StaticResource CheckBoxContentMarginWhenTop}" />
    2.33                          </CheckBox>
    2.34 -                        <CheckBox Grid.Row="2"
    2.35 +                        <CheckBox Grid.Row="1"
    2.36                                    VerticalContentAlignment="Top"
    2.37                                    IsThreeState="False"
    2.38                                    IsChecked="{Binding Path=IsSecurityLossWarningEnabled, Mode=TwoWay}">
    2.39 @@ -368,7 +352,7 @@
    2.40                                         TextWrapping="Wrap"
    2.41                                         Margin="{StaticResource CheckBoxContentMarginWhenTop}" />
    2.42                          </CheckBox>
    2.43 -                        <CheckBox Grid.Row="3"
    2.44 +                        <CheckBox Grid.Row="2"
    2.45                                    VerticalContentAlignment="Top"
    2.46                                    IsThreeState="False"
    2.47                                    IsChecked="{Binding Path=IsNeverUnsecureOptionVisible, Mode=TwoWay}">
    2.48 @@ -390,7 +374,7 @@
    2.49                                         TextWrapping="Wrap"
    2.50                                         Margin="{StaticResource CheckBoxContentMarginWhenTop}" />
    2.51                          </CheckBox>
    2.52 -                        <ComboBox Grid.Row="4"
    2.53 +                        <ComboBox Grid.Row="3"
    2.54                                    ItemsSource="{Binding Path=TrustwordsCultureList}"
    2.55                                    DisplayMemberPath="Value"
    2.56                                    SelectedValuePath="Key"
    2.57 @@ -417,6 +401,7 @@
    2.58                          <RowDefinition Height="Auto" />
    2.59                          <RowDefinition Height="Auto" />
    2.60                          <RowDefinition Height="Auto" />
    2.61 +                        <RowDefinition Height="Auto" />
    2.62                          <RowDefinition Height="*" />
    2.63                      </Grid.RowDefinitions>
    2.64  
    2.65 @@ -428,13 +413,30 @@
    2.66                                 FontSize="16" />
    2.67                      <Separator Grid.Row="1" />
    2.68  
    2.69 +                    <!--Unprotected subject-->
    2.70 +                    <CheckBox Grid.Row="2"
    2.71 +                              VerticalContentAlignment="Top"
    2.72 +                              IsThreeState="False"
    2.73 +                              IsChecked="{Binding Path=IsUnencryptedSubjectEnabled, Mode=TwoWay}"
    2.74 +                              Visibility="{Binding Path=ReleaseMode, Mode=OneWay, Converter={StaticResource IsReleaseModeToVisibility}, ConverterParameter='Standard'}">
    2.75 +                        <CheckBox.Margin>
    2.76 +                            <Thickness Bottom="0"
    2.77 +                                       Left="{StaticResource PageLeftSpacing}"
    2.78 +                                       Right="0"
    2.79 +                                       Top="{StaticResource PageTopSpacing}" />
    2.80 +                        </CheckBox.Margin>
    2.81 +                        <TextBlock Text="{Binding Path=IsUnencryptedSubjectEnabledText, FallbackValue='Enable unprotected message subjects'}"
    2.82 +                                   TextWrapping="Wrap"
    2.83 +                                   Margin="{StaticResource CheckBoxContentMarginWhenTop}" />
    2.84 +                    </CheckBox>
    2.85 +
    2.86                      <!-- Key management -->
    2.87 -                    <StackPanel Grid.Row="2">
    2.88 +                    <StackPanel Grid.Row="3">
    2.89                          <StackPanel.Margin>
    2.90                              <Thickness Bottom="0"
    2.91                                         Left="{StaticResource PageLeftSpacing}"
    2.92                                         Right="0"
    2.93 -                                       Top="{StaticResource PageTopSpacing}" />
    2.94 +                                       Top="{StaticResource PageSubSectionSpacing}" />
    2.95                          </StackPanel.Margin>
    2.96                          <CheckBox VerticalContentAlignment="Center"
    2.97                                    IsThreeState="False"
    2.98 @@ -457,7 +459,7 @@
    2.99                      </StackPanel>
   2.100  
   2.101                      <!-- Key blacklist title -->
   2.102 -                    <TextBlock Grid.Row="3"
   2.103 +                    <TextBlock Grid.Row="4"
   2.104                                 Text="{Binding Path=PageSectionBlacklistText, FallbackValue='Key Blacklist'}"
   2.105                                 FontWeight="Bold"
   2.106                                 FontSize="16">
   2.107 @@ -476,7 +478,7 @@
   2.108                                         Top="{StaticResource PageSectionSpacing}" />
   2.109                          </TextBlock.Margin>
   2.110                      </TextBlock>
   2.111 -                    <Separator Grid.Row="4">
   2.112 +                    <Separator Grid.Row="5">
   2.113                          <Separator.Visibility>
   2.114                              <MultiBinding Converter="{StaticResource MultiBooleanToVisibility}">
   2.115                                  <Binding Path="ReleaseMode"
   2.116 @@ -488,7 +490,7 @@
   2.117                      </Separator>
   2.118  
   2.119                      <!-- Blacklist -->
   2.120 -                    <Grid Grid.Row="5">
   2.121 +                    <Grid Grid.Row="6">
   2.122                          <Grid.Visibility>
   2.123                              <MultiBinding Converter="{StaticResource MultiBooleanToVisibility}">
   2.124                                  <Binding Path="ReleaseMode"
     3.1 --- a/pEpForOutlook.csproj	Tue Apr 10 10:50:14 2018 +0200
     3.2 +++ b/pEpForOutlook.csproj	Tue Apr 10 11:47:55 2018 +0200
     3.3 @@ -43,7 +43,7 @@
     3.4      <PublishUrl>publish\</PublishUrl>
     3.5      <InstallUrl>https://pep-project.org/</InstallUrl>
     3.6      <TargetCulture>en</TargetCulture>
     3.7 -    <ApplicationVersion>1.0.100.0</ApplicationVersion>
     3.8 +    <ApplicationVersion>1.0.101.0</ApplicationVersion>
     3.9      <AutoIncrementApplicationRevision>true</AutoIncrementApplicationRevision>
    3.10      <UpdateEnabled>true</UpdateEnabled>
    3.11      <UpdateInterval>0</UpdateInterval>