Adapt style names OUT-592
authorThomas
Mon, 19 Aug 2019 09:29:18 +0200
branchOUT-592
changeset 2706ca3e21821b92
parent 2705 780842c9d28e
child 2708 dd213ba49cb1
Adapt style names
UI/FormControlOptions.xaml
UI/KeySyncWizard.xaml.cs
     1.1 --- a/UI/FormControlOptions.xaml	Mon Aug 19 07:40:08 2019 +0200
     1.2 +++ b/UI/FormControlOptions.xaml	Mon Aug 19 09:29:18 2019 +0200
     1.3 @@ -515,13 +515,13 @@
     1.4                          </StackPanel>
     1.5                          <StackPanel Grid.Row="7"
     1.6                                      Orientation="Horizontal">
     1.7 -                            <Button Style="{StaticResource StyleWrongButton}"
     1.8 +                            <Button Style="{StaticResource StyleButtonWrong}"
     1.9                                      Margin="0,0,10,0"
    1.10                                      HorizontalAlignment="Left"
    1.11                                      Content="{x:Static p:Resources.Options_LeaveDeviceGroupText}"
    1.12                                      Click="ButtonLeaveDeviceGroup_Click"
    1.13                                      Visibility="{Binding IsGrouped, Converter={StaticResource BoolToVisibility}}" />
    1.14 -                            <Button Style="{StaticResource StyleWrongButton}"
    1.15 +                            <Button Style="{StaticResource StyleButtonWrong}"
    1.16                                      HorizontalAlignment="Left"
    1.17                                      Content="{x:Static p:Resources.Options_ResetAllOwnKeys}"
    1.18                                      Click="ButtonResetAllOwnKeys_Click" />
     2.1 --- a/UI/KeySyncWizard.xaml.cs	Mon Aug 19 07:40:08 2019 +0200
     2.2 +++ b/UI/KeySyncWizard.xaml.cs	Mon Aug 19 09:29:18 2019 +0200
     2.3 @@ -1403,8 +1403,8 @@
     2.4              try
     2.5              {
     2.6                  ResourceDictionary dictionary = Application.LoadComponent(new Uri("/pEp;component/Resources/Dictionary.xaml", UriKind.Relative)) as ResourceDictionary;
     2.7 -                KeySyncWizard.greenButtonStyle = dictionary["StyleConfirmButton"] as Style;
     2.8 -                KeySyncWizard.redButtonStyle = dictionary["StyleWrongButton"] as Style;
     2.9 +                KeySyncWizard.greenButtonStyle = dictionary["StyleButtonConfirm"] as Style;
    2.10 +                KeySyncWizard.redButtonStyle = dictionary["StyleButtonWrong"] as Style;
    2.11              }
    2.12              catch (Exception ex)
    2.13              {