OUT-590: Adjust margin and images refactor_dialogs
authorThomas
Fri, 23 Aug 2019 15:44:52 +0200
branchrefactor_dialogs
changeset 271918e586c50855
parent 2718 1c020b60345a
child 2720 10617a807856
OUT-590: Adjust margin and images
Properties/Resources.Designer.cs
Properties/Resources.resx
UI/ViewModels/HandshakeViewModel.cs
UI/ViewModels/SyncWizardViewModel.cs
UI/Views/HandshakeView.xaml
     1.1 --- a/Properties/Resources.Designer.cs	Fri Aug 23 15:33:39 2019 +0200
     1.2 +++ b/Properties/Resources.Designer.cs	Fri Aug 23 15:44:52 2019 +0200
     1.3 @@ -431,7 +431,7 @@
     1.4          }
     1.5          
     1.6          /// <summary>
     1.7 -        ///   Looks up a localized string similar to Wrong Fingerprint.
     1.8 +        ///   Looks up a localized string similar to Wrong fingerprint.
     1.9          /// </summary>
    1.10          public static string Handshake_WrongFingerprint {
    1.11              get {
     2.1 --- a/Properties/Resources.resx	Fri Aug 23 15:33:39 2019 +0200
     2.2 +++ b/Properties/Resources.resx	Fri Aug 23 15:44:52 2019 +0200
     2.3 @@ -739,7 +739,7 @@
     2.4      <value>The mail size exceeds the allowable limit for encryption.</value>
     2.5    </data>
     2.6    <data name="Handshake_WrongFingerprint" xml:space="preserve">
     2.7 -    <value>Wrong Fingerprint</value>
     2.8 +    <value>Wrong fingerprint</value>
     2.9    </data>
    2.10    <data name="Handshake_StartTrusting" xml:space="preserve">
    2.11      <value>Start Trusting</value>
     3.1 --- a/UI/ViewModels/HandshakeViewModel.cs	Fri Aug 23 15:33:39 2019 +0200
     3.2 +++ b/UI/ViewModels/HandshakeViewModel.cs	Fri Aug 23 15:44:52 2019 +0200
     3.3 @@ -4,6 +4,7 @@
     3.4  using System.Collections.Generic;
     3.5  using System.Collections.ObjectModel;
     3.6  using System.Globalization;
     3.7 +using System.Windows;
     3.8  using System.Windows.Media;
     3.9  using System.Windows.Media.Imaging;
    3.10  
    3.11 @@ -31,6 +32,7 @@
    3.12          private string                              _FingerprintMyself          = null;
    3.13          private string                              _FingerprintPartner         = null;
    3.14          private string                              _PartnerDisplayName         = null;
    3.15 +        private Thickness                           _Margin                     = new Thickness(0);
    3.16          private ImageSource                         _PEPColorIcon               = null;
    3.17          private ObservableCollection<SyncIdentity>  _SyncIdentities             = null;
    3.18          private CultureInfo                         _TrustwordsCulture          = null;
    3.19 @@ -173,6 +175,19 @@
    3.20          }
    3.21  
    3.22          /// <summary>
    3.23 +        /// Gets or sets the margin of the handshake view.
    3.24 +        /// </summary>
    3.25 +        public Thickness Margin
    3.26 +        {
    3.27 +            get => this._Margin;
    3.28 +            set
    3.29 +            {
    3.30 +                this._Margin = value;
    3.31 +                this.OnPropertyChanged();
    3.32 +            }
    3.33 +        }
    3.34 +
    3.35 +        /// <summary>
    3.36          /// Gets or sets the name to display for this item.
    3.37          /// </summary>
    3.38          public string PartnerDisplayName
    3.39 @@ -334,6 +349,9 @@
    3.40              {
    3.41                  case Dialog.DialogType.Handshake:
    3.42                      {
    3.43 +                        // Set margin
    3.44 +                        this.Margin = new Thickness(10);
    3.45 +
    3.46                          // Check if pEp user
    3.47                          try
    3.48                          {
     4.1 --- a/UI/ViewModels/SyncWizardViewModel.cs	Fri Aug 23 15:33:39 2019 +0200
     4.2 +++ b/UI/ViewModels/SyncWizardViewModel.cs	Fri Aug 23 15:44:52 2019 +0200
     4.3 @@ -30,7 +30,7 @@
     4.4                  new WizardGenericPageViewModel
     4.5                  {
     4.6                      ExplanationText = Properties.Resources.Handshake_SyncTypeAExplanationText,
     4.7 -                    Image = new BitmapImage(new Uri("pack://application:,,,/pEp;component/Resources/ImageIconDeviceGroup.png", UriKind.RelativeOrAbsolute)),
     4.8 +                    Image = new BitmapImage(new Uri("pack://application:,,,/pEp;component/Resources/ImageIconDeviceGroup2.png", UriKind.RelativeOrAbsolute)),
     4.9                      IsButtonBackVisible = false
    4.10                  },
    4.11                                  
     5.1 --- a/UI/Views/HandshakeView.xaml	Fri Aug 23 15:33:39 2019 +0200
     5.2 +++ b/UI/Views/HandshakeView.xaml	Fri Aug 23 15:44:52 2019 +0200
     5.3 @@ -42,7 +42,8 @@
     5.4      </UserControl.Resources>
     5.5      
     5.6      <!--The window content-->
     5.7 -    <StackPanel>
     5.8 +    <StackPanel Width="480"
     5.9 +                Margin="{Binding Margin}">
    5.10  
    5.11          <!--Information section-->
    5.12          <TextBlock Text="{Binding Path=ExplanationText, Mode=OneWay}"