Merge with sync OUT-573
authorThomas
Mon, 17 Jun 2019 14:09:48 +0200
branchOUT-573
changeset 266868b3a55e02a0
parent 2667 1a7d192f0d56
parent 2666 6e23630511c3
child 2669 bdaaa25efcd7
Merge with sync
     1.1 --- a/Properties/Resources.Designer.cs	Mon Jun 17 14:09:26 2019 +0200
     1.2 +++ b/Properties/Resources.Designer.cs	Mon Jun 17 14:09:48 2019 +0200
     1.3 @@ -278,6 +278,15 @@
     1.4          }
     1.5          
     1.6          /// <summary>
     1.7 +        ///   Looks up a localized string similar to Select identities to sync.
     1.8 +        /// </summary>
     1.9 +        public static string Handshake_SelectSyncIdentities {
    1.10 +            get {
    1.11 +                return ResourceManager.GetString("Handshake_SelectSyncIdentities", resourceCulture);
    1.12 +            }
    1.13 +        }
    1.14 +        
    1.15 +        /// <summary>
    1.16          ///   Looks up a localized string similar to Show all recipients.
    1.17          /// </summary>
    1.18          public static string Handshake_ShowAllRecipientsText {
     2.1 --- a/Properties/Resources.de.resx	Mon Jun 17 14:09:26 2019 +0200
     2.2 +++ b/Properties/Resources.de.resx	Mon Jun 17 14:09:48 2019 +0200
     2.3 @@ -849,4 +849,7 @@
     2.4    <data name="Notifications_DeviceGroupLeftText" xml:space="preserve">
     2.5      <value>Ger├Ątegruppe wurde verlassen</value>
     2.6    </data>
     2.7 +  <data name="Handshake_SelectSyncIdentities" xml:space="preserve">
     2.8 +    <value>Zu synchronisierende Identit├Ąten</value>
     2.9 +  </data>
    2.10  </root>
    2.11 \ No newline at end of file
     3.1 --- a/Properties/Resources.es.resx	Mon Jun 17 14:09:26 2019 +0200
     3.2 +++ b/Properties/Resources.es.resx	Mon Jun 17 14:09:48 2019 +0200
     3.3 @@ -849,4 +849,7 @@
     3.4    <data name="Notifications_DeviceGroupLeftText" xml:space="preserve">
     3.5      <value>Has salido del grupo de dispositivos</value>
     3.6    </data>
     3.7 +  <data name="Handshake_SelectSyncIdentities" xml:space="preserve">
     3.8 +    <value>Identidades a sincronizar</value>
     3.9 +  </data>
    3.10  </root>
    3.11 \ No newline at end of file
     4.1 --- a/Properties/Resources.resx	Mon Jun 17 14:09:26 2019 +0200
     4.2 +++ b/Properties/Resources.resx	Mon Jun 17 14:09:48 2019 +0200
     4.3 @@ -970,4 +970,7 @@
     4.4    <data name="Notifications_DeviceGroupLeftText" xml:space="preserve">
     4.5      <value>Device Group has been left</value>
     4.6    </data>
     4.7 +  <data name="Handshake_SelectSyncIdentities" xml:space="preserve">
     4.8 +    <value>Select identities to sync</value>
     4.9 +  </data>
    4.10  </root>
    4.11 \ No newline at end of file
     5.1 --- a/UI/HandshakeDialog.xaml	Mon Jun 17 14:09:26 2019 +0200
     5.2 +++ b/UI/HandshakeDialog.xaml	Mon Jun 17 14:09:48 2019 +0200
     5.3 @@ -21,6 +21,10 @@
     5.4          <ResourceDictionary>
     5.5              <!-- Converters -->
     5.6              <BooleanToVisibilityConverter x:Key="BoolToVisibility" />
     5.7 +            <local:ValueConverterGroup x:Key="IsSyncModeToVisibility">
     5.8 +                <local:IsSyncModeToBoolConverter />
     5.9 +                <BooleanToVisibilityConverter />
    5.10 +            </local:ValueConverterGroup>
    5.11          </ResourceDictionary>
    5.12      </Window.Resources>
    5.13  
    5.14 @@ -35,10 +39,11 @@
    5.15  
    5.16          <!--Sync identities-->
    5.17          <ComboBox ItemsSource="{Binding SyncIdentities}"
    5.18 -                  Text="Select identities to sync"
    5.19 +                  Text="{x:Static p:Resources.Handshake_SelectSyncIdentities}"
    5.20                    IsEditable="True"
    5.21                    IsReadOnly="True"
    5.22 -                  Focusable="False">
    5.23 +                  Focusable="False"
    5.24 +                  Visibility="{Binding Mode, Converter={StaticResource IsSyncModeToVisibility}}">
    5.25              <ComboBox.ItemTemplate>
    5.26                  <DataTemplate>
    5.27                      <StackPanel Orientation="Horizontal">