Some reordering. Add German translation. OUT-436
authorThomas
Wed, 25 Apr 2018 10:09:01 +0200
branchOUT-436
changeset 21505aae9c8dbebe
parent 2149 a60a1d9d8e99
child 2151 d3d88104bfa4
Some reordering. Add German translation.
PEPSettings.cs
Properties/Resources.de.resx
ThisAddIn.cs
UI/FormControlOptions.xaml
UI/FormControlOptions.xaml.cs
     1.1 --- a/PEPSettings.cs	Tue Apr 24 17:47:42 2018 +0200
     1.2 +++ b/PEPSettings.cs	Wed Apr 25 10:09:01 2018 +0200
     1.3 @@ -738,7 +738,6 @@
     1.4               *   • IsDeveloperModeEnabled
     1.5               *   • IsSensitiveDataLoggingEnabled
     1.6               *   • IsDisableProtectionForContactsEnabled
     1.7 -             *   • IsPassiveModeEnabled
     1.8               *   • IsTNEFDisabled
     1.9               */
    1.10  
    1.11 @@ -839,6 +838,7 @@
    1.12                          pEpKey.SetValue(PEPSettings.REG_NAME_IS_VERBOSE_LOGGING_ENABLED, this._IsVerboseLoggingEnabled.ToString(), RegistryValueKind.String);
    1.13                          pEpKey.SetValue(PEPSettings.REG_NAME_TRUSTWORDS_CULTURE, (this._TrustwordsCulture?.TwoLetterISOLanguageName ?? string.Empty), RegistryValueKind.String);
    1.14                          pEpKey.SetValue(PEPSettings.REG_NAME_IS_PASSIVE_MODE_ENABLED, this._IsPassiveModeEnabled.ToString(), RegistryValueKind.String);
    1.15 +
    1.16                          // Set IsFirstStartupComplete
    1.17                          if (this._IsFirstStartupComplete)
    1.18                          {
     2.1 --- a/Properties/Resources.de.resx	Tue Apr 24 17:47:42 2018 +0200
     2.2 +++ b/Properties/Resources.de.resx	Wed Apr 25 10:09:01 2018 +0200
     2.3 @@ -710,4 +710,7 @@
     2.4    <data name="PreviewMessage_RemoteImagesWarningText" xml:space="preserve">
     2.5      <value>Klicken Sie hier, um Bilder herunterzuladen. Um den Datenschutz zu erhöhen, hat Outlook den automatischen Download von Bildern in dieser Nachricht verhindert.</value>
     2.6    </data>
     2.7 +  <data name="Options_IsPassiveModeEnabledText" xml:space="preserve">
     2.8 +    <value>Passivmodus aktivieren</value>
     2.9 +  </data>
    2.10  </root>
    2.11 \ No newline at end of file
     3.1 --- a/ThisAddIn.cs	Tue Apr 24 17:47:42 2018 +0200
     3.2 +++ b/ThisAddIn.cs	Wed Apr 25 10:09:01 2018 +0200
     3.3 @@ -1166,6 +1166,7 @@
     3.4                  this._Settings.IsEncryptAllAccountsEnabled = state.IsEncryptAllAccountsEnabled;
     3.5                  this._Settings.IsKeyServerUsed = state.IsKeyServerUsed;
     3.6                  this._Settings.IsNeverUnsecureOptionVisible = state.IsNeverUnsecureOptionVisible;
     3.7 +                this._Settings.IsPassiveModeEnabled = state.IsPassiveModeEnabled;
     3.8                  this._Settings.IsPEPFolderVisible = state.IsPEPFolderVisible;
     3.9                  this._Settings.IsSecurityLossWarningEnabled = state.IsSecurityLossWarningEnabled;
    3.10                  this._Settings.IsSyncEnabledForAllAccounts = state.IsSyncEnabledForAllAccounts;
    3.11 @@ -1337,6 +1338,7 @@
    3.12              state.IsEncryptAllAccountsEnabled = this._Settings.IsEncryptAllAccountsEnabled;
    3.13              state.IsKeyServerUsed = this._Settings.IsKeyServerUsed;
    3.14              state.IsNeverUnsecureOptionVisible = this._Settings.IsNeverUnsecureOptionVisible;
    3.15 +            state.IsPassiveModeEnabled = this._Settings.IsPassiveModeEnabled;
    3.16              state.IsPEPFolderDefaultStore = isDefaultStore;
    3.17              state.IsPEPFolderVisible = (isDefaultStore ? true : this._Settings.IsPEPFolderVisible);
    3.18              state.IsSecurityLossWarningEnabled = this._Settings.IsSecurityLossWarningEnabled;
     4.1 --- a/UI/FormControlOptions.xaml	Tue Apr 24 17:47:42 2018 +0200
     4.2 +++ b/UI/FormControlOptions.xaml	Wed Apr 25 10:09:01 2018 +0200
     4.3 @@ -302,7 +302,7 @@
     4.4                      </Grid>
     4.5  
     4.6                      <!-- Account-wide settings part 2-->
     4.7 -                    <Grid Grid.Row="5">
     4.8 +                    <Grid Grid.Row="4">
     4.9                          <Grid.Margin>
    4.10                              <Thickness Bottom="{StaticResource PageBottomSpacing}"
    4.11                                         Left="{StaticResource PageLeftSpacing}"
    4.12 @@ -393,7 +393,7 @@
    4.13                                             Right="0"
    4.14                                             Top="{StaticResource PageSubSectionSpacing}" />
    4.15                              </CheckBox.Margin>
    4.16 -                            <TextBlock Text="{Binding Path=IsPassiveModeEnabledText, FallbackValue='Enable Passive Mode'}"
    4.17 +                            <TextBlock Text="{x:Static p:Resources.Options_IsPassiveModeEnabledText}"
    4.18                                         TextWrapping="Wrap"
    4.19                                         Margin="{StaticResource CheckBoxContentMarginWhenTop}" />
    4.20                          </CheckBox>
     5.1 --- a/UI/FormControlOptions.xaml.cs	Tue Apr 24 17:47:42 2018 +0200
     5.2 +++ b/UI/FormControlOptions.xaml.cs	Wed Apr 25 10:09:01 2018 +0200
     5.3 @@ -357,8 +357,8 @@
     5.4              private bool                                    _IsKeyServerUsed;
     5.5              private string                                  _IsKeyServerUsedText;
     5.6              private bool                                    _IsNeverUnsecureOptionVisible;
     5.7 +            private string                                  _IsNeverUnsecureOptionVisibleText;
     5.8              private bool                                    _IsPassiveModeEnabled;
     5.9 -            private string                                  _IsNeverUnsecureOptionVisibleText;
    5.10              private bool                                    _IsPEPFolderDefaultStore;
    5.11              private bool                                    _IsPEPFolderVisible;
    5.12              private string                                  _IsPEPFolderVisibleText;
    5.13 @@ -401,7 +401,6 @@
    5.14              private List<KVPair<string, string>>            _SystemInfo;
    5.15              private CultureInfo                             _TrustwordsCulture;
    5.16              private List<KeyValuePair<CultureInfo, string>> _TrustwordsCultureList;
    5.17 -            private string                                  _IsPassiveModeEnabledText;
    5.18  
    5.19              private bool calcDepPropIsEnabled;
    5.20  
    5.21 @@ -692,16 +691,16 @@
    5.22              }
    5.23  
    5.24              /// <summary>
    5.25 -            /// Gets and sets Passive Mode option in UI
    5.26 +            /// Gets or sets whether the passive mode is enabled.
    5.27              /// </summary>
    5.28              public bool IsPassiveModeEnabled
    5.29              {
    5.30 -                get { return (Globals.ThisAddIn.Settings.IsPassiveModeEnabled); }
    5.31 +                get { return (this._IsPassiveModeEnabled); }
    5.32                  set
    5.33                  {
    5.34                      this._IsPassiveModeEnabled = value;
    5.35 -                    Globals.ThisAddIn.Settings.IsPassiveModeEnabled = value;
    5.36 -                    this.RaisePropertyChangedEvent(nameof(this.IsPassiveModeEnabled));                    
    5.37 +                    this.RaisePropertyChangedEvent(nameof(this.IsPassiveModeEnabled)); 
    5.38 +                                       
    5.39                      this.CalcDependentProperties();
    5.40                  }
    5.41              }
    5.42 @@ -714,15 +713,6 @@
    5.43                  get { return (this._IsNeverUnsecureOptionVisibleText); }
    5.44              }
    5.45  
    5.46 -
    5.47 -            /// <summary>
    5.48 -            /// Gets the text for Passive Mode Enable in the UI.
    5.49 -            /// </summary>
    5.50 -            public string IsPassiveModeEnabledText
    5.51 -            {
    5.52 -                get { return (this._IsPassiveModeEnabledText); }
    5.53 -            }
    5.54 -
    5.55              /// <summary>
    5.56              /// Gets or sets whether the pEp folder is the default store in Outlook.
    5.57              /// </summary>
    5.58 @@ -1305,6 +1295,7 @@
    5.59                  copy.IsEncryptAllAccountsEnabled = this._IsEncryptAllAccountsEnabled;
    5.60                  copy.IsKeyServerUsed = this._IsKeyServerUsed;
    5.61                  copy.IsNeverUnsecureOptionVisible = this._IsNeverUnsecureOptionVisible;
    5.62 +                copy.IsPassiveModeEnabled = this._IsPassiveModeEnabled;
    5.63                  copy.IsPEPFolderDefaultStore = this._IsPEPFolderDefaultStore;
    5.64                  copy.IsPEPFolderVisible = this._IsPEPFolderVisible;
    5.65                  copy.IsSecurityLossWarningEnabled = this._IsSecurityLossWarningEnabled;
    5.66 @@ -1319,7 +1310,6 @@
    5.67                  copy.SelectedPageIndex = this._SelectedPageIndex;
    5.68                  copy.SystemInfo = this._SystemInfo;
    5.69                  copy.TrustwordsCulture = ((this._TrustwordsCulture != null) ? new CultureInfo(this._TrustwordsCulture.LCID) : null);
    5.70 -                copy.IsPassiveModeEnabled = this._IsPassiveModeEnabled;
    5.71  
    5.72                  return (copy);
    5.73              }
    5.74 @@ -1355,6 +1345,7 @@
    5.75                  this._IsEncryptAllAccountsEnabled = PEPSettings.IS_ENCRYPT_ALL_ACCOUNTS_ENABLED_DEFAULT;
    5.76                  this._IsKeyServerUsed = PEPSettings.IS_KEY_SERVER_USED_DEFAULT;
    5.77                  this._IsNeverUnsecureOptionVisible = PEPSettings.IS_NEVER_UNSECURE_OPTION_VISIBLE_DEFAULT;
    5.78 +                this._IsPassiveModeEnabled = PEPSettings.IS_PASSIVE_MODE_ENABLED_DEFAULT;
    5.79                  this._IsPEPFolderDefaultStore = false;
    5.80                  this._IsPEPFolderVisible = PEPSettings.IS_PEP_FOLDER_VISIBLE_DEFAULT;
    5.81                  this._IsSecurityLossWarningEnabled = PEPSettings.IS_SECURITY_LOSS_WARNING_ENABLED_DEFAULT;
    5.82 @@ -1388,6 +1379,7 @@
    5.83                  this.RaisePropertyChangedEvent(nameof(this.IsEncryptAllAccountsEnabled));
    5.84                  this.RaisePropertyChangedEvent(nameof(this.IsKeyServerUsed));
    5.85                  this.RaisePropertyChangedEvent(nameof(this.IsNeverUnsecureOptionVisible));
    5.86 +                this.RaisePropertyChangedEvent(nameof(this.IsPassiveModeEnabled));
    5.87                  this.RaisePropertyChangedEvent(nameof(this.IsPEPFolderDefaultStore));
    5.88                  this.RaisePropertyChangedEvent(nameof(this.IsPEPFolderVisible));
    5.89                  this.RaisePropertyChangedEvent(nameof(this.IsSecurityLossWarningEnabled));
    5.90 @@ -1405,7 +1397,6 @@
    5.91                  this.RaisePropertyChangedEvent(nameof(this.SystemInfo));
    5.92                  this.RaisePropertyChangedEvent(nameof(this.TrustwordsCulture));
    5.93                  this.RaisePropertyChangedEvent(nameof(this.TrustwordsCultureList));
    5.94 -                this.RaisePropertyChangedEvent(nameof(this.IsPassiveModeEnabled));
    5.95  
    5.96                  // Set independent display text properties
    5.97                  this._AccountIsPEPEnabledText = pEp.Properties.Resources.Options_AccountIsPEPEnabledText;
    5.98 @@ -1446,7 +1437,6 @@
    5.99                  this._PageSectionOpenPGPCompatibilityText = pEp.Properties.Resources.Options_PageSectionOpenPGPCompatibilityText;
   5.100                  this._PEPWebAddress = pEp.Properties.Resources.Options_PEPWebAddress;
   5.101                  this._ResetPEPStoreText = pEp.Properties.Resources.Options_ResetPEPStoreText;
   5.102 -                this._IsPassiveModeEnabledText = pEp.Properties.Resources.Options_IsPassiveModeEnabledText;
   5.103  
   5.104                  this.RaisePropertyChangedEvent(nameof(this.AccountIsPEPEnabledText));
   5.105                  this.RaisePropertyChangedEvent(nameof(this.AccountIsSecureStorageEnabledText));