Merge with default OUT-428
authorThomas
Tue, 10 Apr 2018 11:47:55 +0200
branchOUT-428
changeset 2105 ecd44ebb48e0
parent 2102 3939ad287c0c (current diff)
parent 2104 0f53d8cc2d82 (diff)
child 2106 7ee0a280030d
Merge with default
pEpForOutlook.csproj
--- a/Properties/AssemblyInfo.cs	Tue Apr 10 10:50:14 2018 +0200
+++ b/Properties/AssemblyInfo.cs	Tue Apr 10 11:47:55 2018 +0200
@@ -43,5 +43,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.100.0")]
-[assembly: AssemblyFileVersion("1.0.100.0")]
+[assembly: AssemblyVersion("1.0.101.0")]
+[assembly: AssemblyFileVersion("1.0.101.0")]
--- a/UI/FormControlOptions.xaml	Tue Apr 10 10:50:14 2018 +0200
+++ b/UI/FormControlOptions.xaml	Tue Apr 10 11:47:55 2018 +0200
@@ -314,26 +314,10 @@
                             <RowDefinition Height="Auto" />
                             <RowDefinition Height="Auto" />
                             <RowDefinition Height="Auto" />
-                            <RowDefinition Height="Auto" />
                         </Grid.RowDefinitions>
                         <CheckBox Grid.Row="0"
                                   VerticalContentAlignment="Top"
                                   IsThreeState="False"
-                                  IsChecked="{Binding Path=IsUnencryptedSubjectEnabled, Mode=TwoWay}"
-                                  Visibility="{Binding Path=ReleaseMode, Mode=OneWay, Converter={StaticResource IsReleaseModeToVisibility}, ConverterParameter='Standard'}">
-                            <CheckBox.Margin>
-                                <Thickness Bottom="0"
-                                           Left="0"
-                                           Right="0"
-                                           Top="{StaticResource PageSubSectionSpacing}" />
-                            </CheckBox.Margin>
-                            <TextBlock Text="{Binding Path=IsUnencryptedSubjectEnabledText, FallbackValue='Enable unprotected message subjects'}"
-                                       TextWrapping="Wrap"
-                                       Margin="{StaticResource CheckBoxContentMarginWhenTop}" />
-                        </CheckBox>
-                        <CheckBox Grid.Row="1"
-                                  VerticalContentAlignment="Top"
-                                  IsThreeState="False"
                                   IsChecked="{Binding Path=IsPEPFolderVisible, Mode=TwoWay}"
                                   Visibility="{Binding Path=IsAdvancedEnabled, Mode=OneWay, Converter={StaticResource BoolToVisibility}}">
                             <CheckBox.Margin>
@@ -346,7 +330,7 @@
                                        TextWrapping="Wrap"
                                        Margin="{StaticResource CheckBoxContentMarginWhenTop}" />
                         </CheckBox>
-                        <CheckBox Grid.Row="2"
+                        <CheckBox Grid.Row="1"
                                   VerticalContentAlignment="Top"
                                   IsThreeState="False"
                                   IsChecked="{Binding Path=IsSecurityLossWarningEnabled, Mode=TwoWay}">
@@ -368,7 +352,7 @@
                                        TextWrapping="Wrap"
                                        Margin="{StaticResource CheckBoxContentMarginWhenTop}" />
                         </CheckBox>
-                        <CheckBox Grid.Row="3"
+                        <CheckBox Grid.Row="2"
                                   VerticalContentAlignment="Top"
                                   IsThreeState="False"
                                   IsChecked="{Binding Path=IsNeverUnsecureOptionVisible, Mode=TwoWay}">
@@ -390,7 +374,7 @@
                                        TextWrapping="Wrap"
                                        Margin="{StaticResource CheckBoxContentMarginWhenTop}" />
                         </CheckBox>
-                        <ComboBox Grid.Row="4"
+                        <ComboBox Grid.Row="3"
                                   ItemsSource="{Binding Path=TrustwordsCultureList}"
                                   DisplayMemberPath="Value"
                                   SelectedValuePath="Key"
@@ -417,6 +401,7 @@
                         <RowDefinition Height="Auto" />
                         <RowDefinition Height="Auto" />
                         <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
                         <RowDefinition Height="*" />
                     </Grid.RowDefinitions>
 
@@ -428,13 +413,30 @@
                                FontSize="16" />
                     <Separator Grid.Row="1" />
 
+                    <!--Unprotected subject-->
+                    <CheckBox Grid.Row="2"
+                              VerticalContentAlignment="Top"
+                              IsThreeState="False"
+                              IsChecked="{Binding Path=IsUnencryptedSubjectEnabled, Mode=TwoWay}"
+                              Visibility="{Binding Path=ReleaseMode, Mode=OneWay, Converter={StaticResource IsReleaseModeToVisibility}, ConverterParameter='Standard'}">
+                        <CheckBox.Margin>
+                            <Thickness Bottom="0"
+                                       Left="{StaticResource PageLeftSpacing}"
+                                       Right="0"
+                                       Top="{StaticResource PageTopSpacing}" />
+                        </CheckBox.Margin>
+                        <TextBlock Text="{Binding Path=IsUnencryptedSubjectEnabledText, FallbackValue='Enable unprotected message subjects'}"
+                                   TextWrapping="Wrap"
+                                   Margin="{StaticResource CheckBoxContentMarginWhenTop}" />
+                    </CheckBox>
+
                     <!-- Key management -->
-                    <StackPanel Grid.Row="2">
+                    <StackPanel Grid.Row="3">
                         <StackPanel.Margin>
                             <Thickness Bottom="0"
                                        Left="{StaticResource PageLeftSpacing}"
                                        Right="0"
-                                       Top="{StaticResource PageTopSpacing}" />
+                                       Top="{StaticResource PageSubSectionSpacing}" />
                         </StackPanel.Margin>
                         <CheckBox VerticalContentAlignment="Center"
                                   IsThreeState="False"
@@ -457,7 +459,7 @@
                     </StackPanel>
 
                     <!-- Key blacklist title -->
-                    <TextBlock Grid.Row="3"
+                    <TextBlock Grid.Row="4"
                                Text="{Binding Path=PageSectionBlacklistText, FallbackValue='Key Blacklist'}"
                                FontWeight="Bold"
                                FontSize="16">
@@ -476,7 +478,7 @@
                                        Top="{StaticResource PageSectionSpacing}" />
                         </TextBlock.Margin>
                     </TextBlock>
-                    <Separator Grid.Row="4">
+                    <Separator Grid.Row="5">
                         <Separator.Visibility>
                             <MultiBinding Converter="{StaticResource MultiBooleanToVisibility}">
                                 <Binding Path="ReleaseMode"
@@ -488,7 +490,7 @@
                     </Separator>
 
                     <!-- Blacklist -->
-                    <Grid Grid.Row="5">
+                    <Grid Grid.Row="6">
                         <Grid.Visibility>
                             <MultiBinding Converter="{StaticResource MultiBooleanToVisibility}">
                                 <Binding Path="ReleaseMode"
--- a/pEpForOutlook.csproj	Tue Apr 10 10:50:14 2018 +0200
+++ b/pEpForOutlook.csproj	Tue Apr 10 11:47:55 2018 +0200
@@ -43,7 +43,7 @@
     <PublishUrl>publish\</PublishUrl>
     <InstallUrl>https://pep-project.org/</InstallUrl>
     <TargetCulture>en</TargetCulture>
-    <ApplicationVersion>1.0.100.0</ApplicationVersion>
+    <ApplicationVersion>1.0.101.0</ApplicationVersion>
     <AutoIncrementApplicationRevision>true</AutoIncrementApplicationRevision>
     <UpdateEnabled>true</UpdateEnabled>
     <UpdateInterval>0</UpdateInterval>