OUT-633: Make all green and red buttons gray that aren't to confirm/reject trustwords sync
authorThomas
Wed, 20 Nov 2019 09:52:21 +0100
branchsync
changeset 287492899af51bca
parent 2873 7981b812045b
child 2875 6b75679c8b61
OUT-633: Make all green and red buttons gray that aren't to confirm/reject trustwords
Resources/Dictionary.xaml
UI/FormControlOptions.xaml
UI/InputMessageBox.xaml
UI/ViewModels/WizardPageViewModelBase.cs
UI/Views/HandshakeDialogView.xaml
UI/Views/HandshakeView.xaml
     1.1 --- a/Resources/Dictionary.xaml	Tue Nov 19 15:42:51 2019 +0100
     1.2 +++ b/Resources/Dictionary.xaml	Wed Nov 20 09:52:21 2019 +0100
     1.3 @@ -106,8 +106,8 @@
     1.4       * 
     1.5       ***********************************************************-->
     1.6  
     1.7 -    <!-- Style for the handshake 'Trust' button -->
     1.8 -    <Style x:Key="StyleTrustButton"
     1.9 +    <!-- Style for a yellow button -->
    1.10 +    <Style x:Key="StyleButtonYellow"
    1.11             TargetType="Button"
    1.12             BasedOn="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
    1.13          <Setter Property="Background"
    1.14 @@ -177,8 +177,8 @@
    1.15          </Setter>
    1.16      </Style>
    1.17  
    1.18 -    <!-- Style for the handshake 'Cancel' button -->
    1.19 -    <Style x:Key="StyleButtonCancel"
    1.20 +    <!-- Style for a gray button -->
    1.21 +    <Style x:Key="StyleButtonGray"
    1.22             TargetType="Button"
    1.23             BasedOn="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
    1.24          <Setter Property="BorderBrush"
    1.25 @@ -235,8 +235,8 @@
    1.26          </Setter>
    1.27      </Style>
    1.28  
    1.29 -    <!-- Style for the handshake 'Confirm trustwords' button -->
    1.30 -    <Style x:Key="StyleButtonConfirm"
    1.31 +    <!-- Style for a green button -->
    1.32 +    <Style x:Key="StyleButtonGreen"
    1.33             TargetType="Button"
    1.34             BasedOn="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
    1.35          <Setter Property="Background"
    1.36 @@ -293,8 +293,8 @@
    1.37          </Setter>
    1.38      </Style>
    1.39  
    1.40 -    <!-- Style for the handshake 'Wrong trustwords' button -->
    1.41 -    <Style x:Key="StyleButtonWrong"
    1.42 +    <!-- Style for a red button -->
    1.43 +    <Style x:Key="StyleButtonRed"
    1.44             TargetType="Button"
    1.45             BasedOn="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
    1.46          <Setter Property="Background"
     2.1 --- a/UI/FormControlOptions.xaml	Tue Nov 19 15:42:51 2019 +0100
     2.2 +++ b/UI/FormControlOptions.xaml	Wed Nov 20 09:52:21 2019 +0100
     2.3 @@ -533,12 +533,12 @@
     2.4                          </StackPanel>
     2.5                          <StackPanel Grid.Row="7"
     2.6                                      Orientation="Horizontal">
     2.7 -                            <Button Style="{StaticResource StyleButtonCancel}"
     2.8 +                            <Button Style="{StaticResource StyleButtonGray}"
     2.9                                      Margin="0,0,10,0"
    2.10                                      HorizontalAlignment="Left"
    2.11                                      Content="{x:Static p:Resources.Options_ResetAllOwnKeys}"
    2.12                                      Click="ButtonResetAllOwnKeys_Click" />
    2.13 -                            <Button Style="{StaticResource StyleButtonCancel}"
    2.14 +                            <Button Style="{StaticResource StyleButtonGray}"
    2.15                                      HorizontalAlignment="Left"
    2.16                                      Content="{x:Static p:Resources.Options_LeaveDeviceGroupText}"
    2.17                                      Click="ButtonLeaveDeviceGroup_Click"
    2.18 @@ -571,7 +571,7 @@
    2.19  
    2.20                      <!--Import key button-->
    2.21                      <Button Grid.Row="2"
    2.22 -                            Style="{StaticResource StyleButtonConfirm}"
    2.23 +                            Style="{StaticResource StyleButtonGray}"
    2.24                              Content="{x:Static p:Resources.StoreContextMenu_OpenPGPKeyImportWizard}" 
    2.25                              HorizontalAlignment="Left"
    2.26                              Margin="10"
     3.1 --- a/UI/InputMessageBox.xaml	Tue Nov 19 15:42:51 2019 +0100
     3.2 +++ b/UI/InputMessageBox.xaml	Wed Nov 20 09:52:21 2019 +0100
     3.3 @@ -36,12 +36,12 @@
     3.4          <StackPanel Orientation="Horizontal"
     3.5                      HorizontalAlignment="Right">
     3.6  
     3.7 -            <Button Style="{StaticResource StyleButtonConfirm}"
     3.8 +            <Button Style="{StaticResource StyleButtonGray}"
     3.9                      HorizontalAlignment="Center"
    3.10                      Margin="5,5,0,5"
    3.11                      Content="{x:Static p:Resources.KeySyncWizard_Next}"
    3.12                      Command="{Binding CommandButtonConfirm}"/>
    3.13 -            <Button Style="{StaticResource StyleButtonCancel}"
    3.14 +            <Button Style="{StaticResource StyleButtonGray}"
    3.15                      HorizontalAlignment="Center"
    3.16                      Margin="5,5,0,5"
    3.17                      Content="{x:Static p:Resources.Options_CancelText}"
     4.1 --- a/UI/ViewModels/WizardPageViewModelBase.cs	Tue Nov 19 15:42:51 2019 +0100
     4.2 +++ b/UI/ViewModels/WizardPageViewModelBase.cs	Wed Nov 20 09:52:21 2019 +0100
     4.3 @@ -19,9 +19,9 @@
     4.4          private bool                _IsButtonRejectHandshakeVisible     = false;
     4.5  
     4.6          // Button styles
     4.7 -        public static Style        GreenButtonStyle                    = (Application.LoadComponent(new Uri("/pEp;component/Resources/Dictionary.xaml", UriKind.Relative)) as ResourceDictionary)["StyleButtonConfirm"] as Style;
     4.8 -        public static Style        GreyButtonStyle                     = (Application.LoadComponent(new Uri("/pEp;component/Resources/Dictionary.xaml", UriKind.Relative)) as ResourceDictionary)["StyleButtonCancel"] as Style;
     4.9 -        public static Style        RedButtonStyle                      = (Application.LoadComponent(new Uri("/pEp;component/Resources/Dictionary.xaml", UriKind.Relative)) as ResourceDictionary)["StyleButtonWrong"] as Style;
    4.10 +        public static Style        GreenButtonStyle                    = (Application.LoadComponent(new Uri("/pEp;component/Resources/Dictionary.xaml", UriKind.Relative)) as ResourceDictionary)["StyleButtonGreen"] as Style;
    4.11 +        public static Style        GreyButtonStyle                     = (Application.LoadComponent(new Uri("/pEp;component/Resources/Dictionary.xaml", UriKind.Relative)) as ResourceDictionary)["StyleButtonGray"] as Style;
    4.12 +        public static Style        RedButtonStyle                      = (Application.LoadComponent(new Uri("/pEp;component/Resources/Dictionary.xaml", UriKind.Relative)) as ResourceDictionary)["StyleButtonRed"] as Style;
    4.13  
    4.14  
    4.15          /// <summary>
     5.1 --- a/UI/Views/HandshakeDialogView.xaml	Tue Nov 19 15:42:51 2019 +0100
     5.2 +++ b/UI/Views/HandshakeDialogView.xaml	Wed Nov 20 09:52:21 2019 +0100
     5.3 @@ -63,7 +63,7 @@
     5.4          <Button HorizontalAlignment="Right"
     5.5                      Command="{Binding CommandButtonClose}"
     5.6                      Content="{x:Static p:Resources.ManagePrivacyStatus_CloseText}"
     5.7 -                    Style="{StaticResource StyleButtonCancel}" />
     5.8 +                    Style="{StaticResource StyleButtonGray}" />
     5.9  
    5.10      </StackPanel>
    5.11  </UserControl>
     6.1 --- a/UI/Views/HandshakeView.xaml	Tue Nov 19 15:42:51 2019 +0100
     6.2 +++ b/UI/Views/HandshakeView.xaml	Wed Nov 20 09:52:21 2019 +0100
     6.3 @@ -218,13 +218,13 @@
     6.4                          HorizontalAlignment="Right"
     6.5                          Margin="0,5,0,0"
     6.6                          Visibility="{Binding Parent.Dialog.DialogType, Converter={StaticResource IsNotWizardModeToVisibility}}">
     6.7 -                    <Button Style="{StaticResource StyleButtonConfirm}"
     6.8 +                    <Button Style="{StaticResource StyleButtonGreen}"
     6.9                          HorizontalAlignment="Center"
    6.10                          Margin="0,5,5,5"
    6.11                          Content="{Binding Path=ButtonConfirmText, FallbackValue=Confirm}"
    6.12                          Command="{Binding ButtonConfirmOnClick}"
    6.13                          IsDefault="True"/>
    6.14 -                    <Button Style="{StaticResource StyleButtonWrong}"
    6.15 +                    <Button Style="{StaticResource StyleButtonRed}"
    6.16                          HorizontalAlignment="Center"
    6.17                          Margin="5,5,0,5"
    6.18                          Content="{Binding Path=ButtonWrongText, FallbackValue=Wrong}"
    6.19 @@ -241,7 +241,7 @@
    6.20                  <TextBlock Text="{x:Static p:Resources.DialogWindow_ResetCommunicationPartner}" 
    6.21                             VerticalAlignment="Center"
    6.22                             Margin="5"/>
    6.23 -                <Button Style="{StaticResource StyleButtonCancel}"
    6.24 +                <Button Style="{StaticResource StyleButtonGray}"
    6.25                          HorizontalAlignment="Center"
    6.26                          Margin="5,5,0,5"
    6.27                          Content="{x:Static p:Resources.Options_Reset}"