feat(ui): give dialog buttons distinct primary and danger levels
This commit is contained in:
1 parent
9c47ce6b38
commit
c2b744e742
13 files changed
+21
-13
No files matched your search
@@ -31,7 +31,8 @@
|
|||||||
|
|
||||||
<Button Grid.Row="1" Content="{x:Static lang:Resources.Common_Ok}"
|
<Button Grid.Row="1" Content="{x:Static lang:Resources.Common_Ok}"
|
||||||
Click="OnCloseClick" HorizontalAlignment="Right" MinWidth="90"
|
Click="OnCloseClick" HorizontalAlignment="Right" MinWidth="90"
|
||||||
IsDefault="True" IsCancel="True"/>
|
IsDefault="True" IsCancel="True"
|
||||||
|
Theme="{DynamicResource SolidButton}" Classes="Primary"/>
|
||||||
|
|
||||||
</Grid>
|
</Grid>
|
||||||
</Window>
|
</Window>
|
||||||
@@ -66,7 +66,8 @@
|
|||||||
|
|
||||||
<StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Right"
|
<StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Right"
|
||||||
Spacing="8" Margin="0,16,0,0">
|
Spacing="8" Margin="0,16,0,0">
|
||||||
<Button Content="{x:Static lang:Resources.Common_Ok}" Click="OnOkClick" MinWidth="90" IsDefault="True"/>
|
<Button Content="{x:Static lang:Resources.Common_Ok}" Click="OnOkClick" MinWidth="90" IsDefault="True"
|
||||||
|
Theme="{DynamicResource SolidButton}" Classes="Primary"/>
|
||||||
<Button Content="{x:Static lang:Resources.Common_Cancel}" Click="OnCancelClick" MinWidth="90"
|
<Button Content="{x:Static lang:Resources.Common_Cancel}" Click="OnCancelClick" MinWidth="90"
|
||||||
IsCancel="True"/>
|
IsCancel="True"/>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
|||||||
@@ -29,7 +29,8 @@
|
|||||||
|
|
||||||
<StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Right"
|
<StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Right"
|
||||||
Spacing="8" Margin="0,16,0,0">
|
Spacing="8" Margin="0,16,0,0">
|
||||||
<Button Content="{x:Static lang:Resources.Common_Ok}" Click="OnOkClick" MinWidth="90" IsDefault="True"/>
|
<Button Content="{x:Static lang:Resources.Common_Ok}" Click="OnOkClick" MinWidth="90" IsDefault="True"
|
||||||
|
Theme="{DynamicResource SolidButton}" Classes="Primary"/>
|
||||||
<Button Content="{x:Static lang:Resources.Common_Cancel}" Click="OnCancelClick" MinWidth="90" IsCancel="True"/>
|
<Button Content="{x:Static lang:Resources.Common_Cancel}" Click="OnCancelClick" MinWidth="90" IsCancel="True"/>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|||||||
@@ -16,7 +16,7 @@
|
|||||||
<TextBlock Grid.Row="0" Text="{Binding Message}" TextWrapping="Wrap" VerticalAlignment="Top"/>
|
<TextBlock Grid.Row="0" Text="{Binding Message}" TextWrapping="Wrap" VerticalAlignment="Top"/>
|
||||||
<StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Right" Spacing="8">
|
<StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Right" Spacing="8">
|
||||||
<Button Content="{x:Static lang:Resources.Common_Delete}" Click="OnConfirmClick"
|
<Button Content="{x:Static lang:Resources.Common_Delete}" Click="OnConfirmClick"
|
||||||
MinWidth="90"/>
|
MinWidth="90" Classes="Danger"/>
|
||||||
<Button Content="{x:Static lang:Resources.Common_Cancel}" Click="OnCancelClick"
|
<Button Content="{x:Static lang:Resources.Common_Cancel}" Click="OnCancelClick"
|
||||||
MinWidth="90" IsDefault="True" IsCancel="True"/>
|
MinWidth="90" IsDefault="True" IsCancel="True"/>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
|||||||
@@ -16,7 +16,7 @@
|
|||||||
<TextBlock Grid.Row="0" Text="{Binding Message}" TextWrapping="Wrap" VerticalAlignment="Top"/>
|
<TextBlock Grid.Row="0" Text="{Binding Message}" TextWrapping="Wrap" VerticalAlignment="Top"/>
|
||||||
<StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Right" Spacing="8">
|
<StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Right" Spacing="8">
|
||||||
<Button Content="{x:Static lang:Resources.Common_Delete}" Click="OnConfirmClick"
|
<Button Content="{x:Static lang:Resources.Common_Delete}" Click="OnConfirmClick"
|
||||||
MinWidth="90"/>
|
MinWidth="90" Classes="Danger"/>
|
||||||
<Button Content="{x:Static lang:Resources.Common_Cancel}" Click="OnCancelClick"
|
<Button Content="{x:Static lang:Resources.Common_Cancel}" Click="OnCancelClick"
|
||||||
MinWidth="90" IsDefault="True" IsCancel="True"/>
|
MinWidth="90" IsDefault="True" IsCancel="True"/>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
|||||||
@@ -16,7 +16,7 @@
|
|||||||
<TextBlock Grid.Row="0" Text="{Binding Message}" TextWrapping="Wrap" VerticalAlignment="Top"/>
|
<TextBlock Grid.Row="0" Text="{Binding Message}" TextWrapping="Wrap" VerticalAlignment="Top"/>
|
||||||
<StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Right" Spacing="8">
|
<StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Right" Spacing="8">
|
||||||
<Button Content="{x:Static lang:Resources.Common_Delete}" Click="OnConfirmClick"
|
<Button Content="{x:Static lang:Resources.Common_Delete}" Click="OnConfirmClick"
|
||||||
MinWidth="90"/>
|
MinWidth="90" Classes="Danger"/>
|
||||||
<Button Content="{x:Static lang:Resources.Common_Cancel}" Click="OnCancelClick"
|
<Button Content="{x:Static lang:Resources.Common_Cancel}" Click="OnCancelClick"
|
||||||
MinWidth="90" IsDefault="True" IsCancel="True"/>
|
MinWidth="90" IsDefault="True" IsCancel="True"/>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
|||||||
@@ -16,7 +16,7 @@
|
|||||||
<TextBlock Grid.Row="0" Text="{Binding Message}" TextWrapping="Wrap" VerticalAlignment="Top"/>
|
<TextBlock Grid.Row="0" Text="{Binding Message}" TextWrapping="Wrap" VerticalAlignment="Top"/>
|
||||||
<StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Right" Spacing="8">
|
<StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Right" Spacing="8">
|
||||||
<Button Content="{x:Static lang:Resources.Common_Ok}" Click="OnConfirmClick"
|
<Button Content="{x:Static lang:Resources.Common_Ok}" Click="OnConfirmClick"
|
||||||
MinWidth="90"/>
|
MinWidth="90" Classes="Danger"/>
|
||||||
<Button Content="{x:Static lang:Resources.Common_Cancel}" Click="OnCancelClick"
|
<Button Content="{x:Static lang:Resources.Common_Cancel}" Click="OnCancelClick"
|
||||||
MinWidth="90" IsDefault="True" IsCancel="True"/>
|
MinWidth="90" IsDefault="True" IsCancel="True"/>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
|||||||
@@ -16,6 +16,7 @@
|
|||||||
<TextBlock Grid.Row="0" Text="{Binding Message}" TextWrapping="Wrap" VerticalAlignment="Top"/>
|
<TextBlock Grid.Row="0" Text="{Binding Message}" TextWrapping="Wrap" VerticalAlignment="Top"/>
|
||||||
<Button Grid.Row="1" Content="{x:Static lang:Resources.Common_Ok}"
|
<Button Grid.Row="1" Content="{x:Static lang:Resources.Common_Ok}"
|
||||||
Click="OnOkClick" HorizontalAlignment="Right" MinWidth="90"
|
Click="OnOkClick" HorizontalAlignment="Right" MinWidth="90"
|
||||||
IsDefault="True" IsCancel="True"/>
|
IsDefault="True" IsCancel="True"
|
||||||
|
Theme="{DynamicResource SolidButton}" Classes="Primary"/>
|
||||||
</Grid>
|
</Grid>
|
||||||
</Window>
|
</Window>
|
||||||
@@ -31,7 +31,8 @@
|
|||||||
<StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Right"
|
<StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Right"
|
||||||
Spacing="8" Margin="0,16,0,0">
|
Spacing="8" Margin="0,16,0,0">
|
||||||
<Button Content="{x:Static lang:Resources.Common_Ok}" Click="OnOkClick"
|
<Button Content="{x:Static lang:Resources.Common_Ok}" Click="OnOkClick"
|
||||||
MinWidth="90" IsDefault="True" IsEnabled="{Binding CanMove}"/>
|
MinWidth="90" IsDefault="True" IsEnabled="{Binding CanMove}"
|
||||||
|
Theme="{DynamicResource SolidButton}" Classes="Primary"/>
|
||||||
<Button Content="{x:Static lang:Resources.Common_Cancel}" Click="OnCancelClick"
|
<Button Content="{x:Static lang:Resources.Common_Cancel}" Click="OnCancelClick"
|
||||||
MinWidth="90" IsCancel="True"/>
|
MinWidth="90" IsCancel="True"/>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
|||||||
@@ -16,6 +16,7 @@
|
|||||||
<TextBlock Grid.Row="0" Text="{Binding Message}" TextWrapping="Wrap" VerticalAlignment="Top"/>
|
<TextBlock Grid.Row="0" Text="{Binding Message}" TextWrapping="Wrap" VerticalAlignment="Top"/>
|
||||||
<Button Grid.Row="1" Content="{x:Static lang:Resources.Common_Ok}"
|
<Button Grid.Row="1" Content="{x:Static lang:Resources.Common_Ok}"
|
||||||
Click="OnOkClick" HorizontalAlignment="Right" MinWidth="90"
|
Click="OnOkClick" HorizontalAlignment="Right" MinWidth="90"
|
||||||
IsDefault="True" IsCancel="True"/>
|
IsDefault="True" IsCancel="True"
|
||||||
|
Theme="{DynamicResource SolidButton}" Classes="Primary"/>
|
||||||
</Grid>
|
</Grid>
|
||||||
</Window>
|
</Window>
|
||||||
@@ -61,7 +61,7 @@
|
|||||||
<StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Right"
|
<StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Right"
|
||||||
Spacing="8" Margin="0,16,0,0">
|
Spacing="8" Margin="0,16,0,0">
|
||||||
<Button Content="{x:Static lang:Resources.Common_Ok}" Click="OnOkClick" MinWidth="90"
|
<Button Content="{x:Static lang:Resources.Common_Ok}" Click="OnOkClick" MinWidth="90"
|
||||||
IsDefault="True"/>
|
IsDefault="True" Theme="{DynamicResource SolidButton}" Classes="Primary"/>
|
||||||
<Button Content="{x:Static lang:Resources.Common_Cancel}" Click="OnCancelClick" MinWidth="90"
|
<Button Content="{x:Static lang:Resources.Common_Cancel}" Click="OnCancelClick" MinWidth="90"
|
||||||
IsCancel="True"/>
|
IsCancel="True"/>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
|||||||
@@ -32,7 +32,8 @@
|
|||||||
|
|
||||||
<StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Right"
|
<StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Right"
|
||||||
Spacing="8" Margin="0,16,0,0">
|
Spacing="8" Margin="0,16,0,0">
|
||||||
<Button Content="{x:Static lang:Resources.Common_Ok}" Click="OnOkClick" MinWidth="90" IsDefault="True"/>
|
<Button Content="{x:Static lang:Resources.Common_Ok}" Click="OnOkClick" MinWidth="90" IsDefault="True"
|
||||||
|
Theme="{DynamicResource SolidButton}" Classes="Primary"/>
|
||||||
<Button Content="{x:Static lang:Resources.Common_Cancel}" Click="OnCancelClick" MinWidth="90" IsCancel="True"/>
|
<Button Content="{x:Static lang:Resources.Common_Cancel}" Click="OnCancelClick" MinWidth="90" IsCancel="True"/>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|||||||
@@ -34,7 +34,8 @@
|
|||||||
<StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Right"
|
<StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Right"
|
||||||
Spacing="8" Margin="0,16,0,0">
|
Spacing="8" Margin="0,16,0,0">
|
||||||
<Button Content="{x:Static lang:Resources.Common_Ok}" Click="OnOkClick"
|
<Button Content="{x:Static lang:Resources.Common_Ok}" Click="OnOkClick"
|
||||||
MinWidth="90" IsDefault="True" IsEnabled="{Binding CanAdd}"/>
|
MinWidth="90" IsDefault="True" IsEnabled="{Binding CanAdd}"
|
||||||
|
Theme="{DynamicResource SolidButton}" Classes="Primary"/>
|
||||||
<Button Content="{x:Static lang:Resources.Common_Cancel}" Click="OnCancelClick"
|
<Button Content="{x:Static lang:Resources.Common_Cancel}" Click="OnCancelClick"
|
||||||
MinWidth="90" IsCancel="True"/>
|
MinWidth="90" IsCancel="True"/>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
|||||||
Reference in new issue
Block a user