Merge with refactor_dialogs sync
authorThomas
Mon, 07 Oct 2019 16:08:39 +0200
branchsync
changeset 279682b886ee1e83
parent 2793 96b1caccde65
parent 2795 6e3f8b15a125
child 2797 9dadc302b32b
Merge with refactor_dialogs
     1.1 --- a/UI/ViewModels/HandshakeViewModel.cs	Fri Oct 04 11:53:08 2019 +0200
     1.2 +++ b/UI/ViewModels/HandshakeViewModel.cs	Mon Oct 07 16:08:39 2019 +0200
     1.3 @@ -32,7 +32,6 @@
     1.4          private string                              _FingerprintPartner         = null;
     1.5          private bool                                _IsExpanded                 = false;
     1.6          private bool                                _IsSeparatorVisible         = false;
     1.7 -        private Thickness                           _Margin                     = new Thickness(0);
     1.8          private PEPIdentity                         _Partner                    = null;
     1.9          private string                              _PartnerDisplayName         = null;
    1.10          private ImageSource                         _PEPColorIcon               = null;
    1.11 @@ -191,19 +190,6 @@
    1.12          }
    1.13  
    1.14          /// <summary>
    1.15 -        /// Gets or sets the margin of the handshake view.
    1.16 -        /// </summary>
    1.17 -        public Thickness Margin
    1.18 -        {
    1.19 -            get => this._Margin;
    1.20 -            set
    1.21 -            {
    1.22 -                this._Margin = value;
    1.23 -                this.OnPropertyChanged();
    1.24 -            }
    1.25 -        }
    1.26 -
    1.27 -        /// <summary>
    1.28          /// The parent view model.
    1.29          /// </summary>
    1.30          public DialogWindowViewModel Parent { get; } = null;
    1.31 @@ -537,7 +523,7 @@
    1.32                  identity = ThisAddIn.PEPEngine.UpdateIdentity(identity);
    1.33                  this.Partner = new PEPIdentity(identity)
    1.34                  {
    1.35 -                    Rating = ThisAddIn.PEPEngine.IdentityRating(identity)
    1.36 +                    Rating = ThisAddIn.PEPEngine.GetKeyRatingForUser(identity.UserId, identity.fpr)
    1.37                  };
    1.38  
    1.39                  // Update view
     2.1 --- a/UI/Views/HandshakeView.xaml	Fri Oct 04 11:53:08 2019 +0200
     2.2 +++ b/UI/Views/HandshakeView.xaml	Mon Oct 07 16:08:39 2019 +0200
     2.3 @@ -47,7 +47,7 @@
     2.4  
     2.5      <!--The window content-->
     2.6      <StackPanel Width="480"
     2.7 -                Margin="{Binding Margin}"
     2.8 +                Margin="10"
     2.9                  MouseLeftButtonUp="HandshakeItem_MouseLeftButtonUp">
    2.10  
    2.11          <StackPanel.Style>
    2.12 @@ -99,7 +99,7 @@
    2.13  
    2.14              <!--Trustwords/Fingerprint section-->
    2.15              <StackPanel Visibility="{Binding Partner.Color, Converter={StaticResource ColorToVisibility}, ConverterParameter=pEpColorYellow}">
    2.16 -                
    2.17 +
    2.18                  <!--Tabs-->
    2.19                  <StackPanel Orientation="Horizontal"
    2.20                      HorizontalAlignment="Right">