ui: Touch up grid settings dialogs (dark theme)
This commit is contained in:
1 parent
c527b6e84f
commit
d172f4ffab
4 files changed
+67
-26
No files matched your search
@@ -441,6 +441,7 @@ namespace mbts.ui {
|
||||
public static BTSColor default_text => 0xffdddded;
|
||||
public static BTSColor default_foreground => 0xffdddded;
|
||||
public static BTSColor default_foreground_dark => 0xffa4a4a4;
|
||||
public static BTSColor disabled_text => 0xff666666;
|
||||
public static BTSColor icon_foreground => 0xffa4a4a4;
|
||||
public static BTSColor alternate_text => BTSCoreColors.white;
|
||||
public static BTSColor foreground_standout => Core.turquoise;
|
||||
|
||||
@@ -7,12 +7,18 @@
|
||||
xmlns:c="clr-namespace:mbts.ui.controls"
|
||||
xmlns:cv="clr-namespace:mbts.ui.converters"
|
||||
>
|
||||
<UserControl.Resources>
|
||||
<cv:ValueMap x:Key="IsEnabledForegroundConverter" Default="{x:Static Brushes.Black}">
|
||||
<cv:KeyValue Key="{u:False}" Value="{u:BTSBrush UI.input_disabled_text}" />
|
||||
</cv:ValueMap>
|
||||
</UserControl.Resources>
|
||||
|
||||
<VisualStateManager.VisualStateGroups>
|
||||
<VisualStateGroup Name="CommonStates">
|
||||
<VisualState Name="Normal" />
|
||||
<VisualState Name="Disabled">
|
||||
<Storyboard>
|
||||
<ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="Foreground" Storyboard.TargetName="_opacity_text">
|
||||
<DiscreteObjectKeyFrame KeyTime="0" Value="{u:BTSBrush UI.disabled_text}" />
|
||||
</ObjectAnimationUsingKeyFrames>
|
||||
</Storyboard>
|
||||
</VisualState>
|
||||
</VisualStateGroup>
|
||||
</VisualStateManager.VisualStateGroups>
|
||||
<Grid x:Name="_grid">
|
||||
<c:ColorPickerPopup
|
||||
x:Name="_color_picker_popup"
|
||||
@@ -30,7 +36,7 @@
|
||||
<TextBlock
|
||||
x:Name="_opacity_text"
|
||||
Text="{Binding SelectedOpacity, RelativeSource={RelativeSource AncestorType=c:ColorPickerPopupWithOpacitySlider}, StringFormat=P0}"
|
||||
Foreground="{Binding CanUserEditOpacity, RelativeSource={RelativeSource AncestorType=c:ColorPickerPopupWithOpacitySlider}, Converter={StaticResource IsEnabledForegroundConverter}}"
|
||||
Foreground="{u:BTSBrush UI.default_text}"
|
||||
/>
|
||||
</Grid>
|
||||
</UserControl>
|
||||
@@ -1,4 +1,4 @@
|
||||
<UserControl
|
||||
<UserControl
|
||||
x:Class="mbts.ui.spark.GridSettingsView"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
@@ -551,17 +551,18 @@
|
||||
<ColumnDefinition Width="*"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
|
||||
<TextBlock>Header</TextBlock>
|
||||
<TextBlock Foreground="{u:BTSBrush UI.default_text}" Text="Header" />
|
||||
<TextBox
|
||||
x:Name="display_name_text_box"
|
||||
Grid.Column="2"
|
||||
ToolTipService.ShowOnDisabled="True"
|
||||
Text="{Binding display_name}"/>
|
||||
|
||||
<TextBlock Grid.Row="2">Width</TextBlock>
|
||||
<TextBlock Grid.Row="2" Foreground="{u:BTSBrush UI.default_text}" Text="Width" />
|
||||
<c:TickUpDownDouble Grid.Row="2" Grid.Column="2" Value="{Binding width}" Format="0.##"/>
|
||||
|
||||
<TextBlock Grid.Row="4">Horizontal Alignment</TextBlock>
|
||||
<TextBlock
|
||||
Grid.Row="4" Foreground="{u:BTSBrush UI.default_text}" Text="Horizontal Alignment" />
|
||||
<ComboBox
|
||||
Grid.Row="4"
|
||||
Grid.Column="2"
|
||||
@@ -763,7 +764,7 @@
|
||||
where null values are propagated to binding targets of the previous SelectedItem -->
|
||||
<TabControl x:Name="column_tabs" Padding="8" SelectedItem="{Binding selected_item, Delay=100}">
|
||||
<TabControl.ItemContainerStyle>
|
||||
<Style TargetType="TabItem">
|
||||
<Style TargetType="TabItem" BasedOn="{StaticResource {x:Type TabItem}}">
|
||||
<Setter Property="HeaderTemplateSelector">
|
||||
<Setter.Value>
|
||||
<u:DataTypeTemplateSelector>
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<Window
|
||||
<Window
|
||||
x:Class="mbts.ui.spark.ShellSettingsDialog"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
@@ -145,13 +145,14 @@
|
||||
<ColumnDefinition Width="*"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
|
||||
<TextBlock>Market Price Decimal Places</TextBlock>
|
||||
<TextBlock Foreground="{u:BTSBrush UI.default_text}" Text="Market Price Decimal Places" />
|
||||
<ComboBox
|
||||
Grid.Column="2"
|
||||
ItemsSource="{Binding decimal_place_options}"
|
||||
SelectedItem="{Binding market_price_decimal_places}" />
|
||||
|
||||
<TextBlock Grid.Row="2" Content="Fill Price Decimal Places" />
|
||||
<TextBlock
|
||||
Grid.Row="2" Foreground="{u:BTSBrush UI.default_text}" Text="Fill Price Decimal Places" />
|
||||
<ComboBox
|
||||
Grid.Row="2"
|
||||
Grid.Column="2"
|
||||
@@ -175,10 +176,15 @@
|
||||
<ColumnDefinition Width="*"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
|
||||
<TextBlock VerticalAlignment="Center" Text="Font" />
|
||||
<TextBlock
|
||||
VerticalAlignment="Center" Foreground="{u:BTSBrush UI.default_text}" Text="Font" />
|
||||
<c:PopupControl Grid.Column="2" Style="{StaticResource FontPickerPopupControl}"/>
|
||||
|
||||
<TextBlock Grid.Row="2" VerticalAlignment="Center" Text="Font Color (default)" />
|
||||
<TextBlock
|
||||
Grid.Row="2"
|
||||
VerticalAlignment="Center"
|
||||
Foreground="{u:BTSBrush UI.default_text}"
|
||||
Text="Font Color (default)" />
|
||||
<c:ColorPickerPopupWithOpacitySlider
|
||||
Grid.Row="2"
|
||||
Grid.Column="2"
|
||||
@@ -187,7 +193,11 @@
|
||||
Palettes="{Binding font_color.palettes}"
|
||||
CanUserEditOpacity="False" />
|
||||
|
||||
<TextBlock Grid.Row="4" VerticalAlignment="Center" Text="Background" />
|
||||
<TextBlock
|
||||
Grid.Row="4"
|
||||
VerticalAlignment="Center"
|
||||
Foreground="{u:BTSBrush UI.default_text}"
|
||||
Text="Background" />
|
||||
<c:ColorPickerPopupWithOpacitySlider
|
||||
Grid.Row="4"
|
||||
Grid.Column="2"
|
||||
@@ -213,10 +223,14 @@
|
||||
<ColumnDefinition Width="*"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
|
||||
<TextBlock VerticalAlignment="Center">Font</TextBlock>
|
||||
<TextBlock VerticalAlignment="Center" Foreground="{u:BTSBrush UI.default_text}" Text="Font" />
|
||||
<c:PopupControl Grid.Column="2" Style="{StaticResource FontPickerPopupControl}"/>
|
||||
|
||||
<TextBlock Grid.Row="2" VerticalAlignment="Center">Font Color (default)</TextBlock>
|
||||
<TextBlock
|
||||
Grid.Row="2"
|
||||
VerticalAlignment="Center"
|
||||
Foreground="{u:BTSBrush UI.default_text}"
|
||||
Text="Font Color (default)" />
|
||||
<c:ColorPickerPopupWithOpacitySlider
|
||||
Grid.Row="2"
|
||||
Grid.Column="2"
|
||||
@@ -957,14 +971,20 @@
|
||||
<ColumnDefinition Width="*"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
|
||||
<TextBlock VerticalAlignment="Center">Font</TextBlock>
|
||||
<TextBlock
|
||||
VerticalAlignment="Center"
|
||||
Foreground="{u:BTSBrush UI.default_text}"
|
||||
Text="Font" />
|
||||
<c:PopupControl
|
||||
Grid.Column="2"
|
||||
HorizontalAlignment="Stretch"
|
||||
Style="{StaticResource FontPickerPopupControl}" />
|
||||
|
||||
<TextBlock
|
||||
Grid.Row="2" VerticalAlignment="Center" Text="Font Color (default)" />
|
||||
Grid.Row="2"
|
||||
VerticalAlignment="Center"
|
||||
Foreground="{u:BTSBrush UI.default_text}"
|
||||
Text="Font Color (default)" />
|
||||
<c:ColorPickerPopupWithOpacitySlider
|
||||
Grid.Row="2"
|
||||
Grid.Column="2"
|
||||
@@ -973,7 +993,10 @@
|
||||
CanUserEditOpacity="False" />
|
||||
|
||||
<TextBlock
|
||||
Grid.Row="4" VerticalAlignment="Center" Text="Selection Highlight" />
|
||||
Grid.Row="4"
|
||||
VerticalAlignment="Center"
|
||||
Foreground="{u:BTSBrush UI.default_text}"
|
||||
Text="Selection Highlight" />
|
||||
<c:ColorPickerPopupWithOpacitySlider
|
||||
Grid.Row="4"
|
||||
Grid.Column="2"
|
||||
@@ -981,7 +1004,10 @@
|
||||
DataContext="{Binding selection_highlight}" />
|
||||
|
||||
<TextBlock
|
||||
Grid.Row="6" VerticalAlignment="Center" Text="Background" />
|
||||
Grid.Row="6"
|
||||
VerticalAlignment="Center"
|
||||
Foreground="{u:BTSBrush UI.default_text}"
|
||||
Text="Background" />
|
||||
<c:ColorPickerPopupWithOpacitySlider
|
||||
Grid.Row="6"
|
||||
Grid.Column="2"
|
||||
@@ -1016,7 +1042,11 @@
|
||||
<ContentControl
|
||||
Grid.ColumnSpan="3" Content="{Binding header_row_defaults}" />
|
||||
|
||||
<TextBlock Grid.Row="2" VerticalAlignment="Center" Text="Display" />
|
||||
<TextBlock
|
||||
Grid.Row="2"
|
||||
VerticalAlignment="Center"
|
||||
Foreground="{u:BTSBrush UI.default_text}"
|
||||
Text="Display" />
|
||||
<ComboBox
|
||||
Grid.Row="2"
|
||||
Grid.Column="2"
|
||||
@@ -1038,7 +1068,10 @@
|
||||
<ColumnDefinition Width="{Binding Source={StaticResource HorizontalPush2}}"/>
|
||||
<ColumnDefinition Width="*"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<TextBlock VerticalAlignment="Center">Calculation</TextBlock>
|
||||
<TextBlock
|
||||
VerticalAlignment="Center"
|
||||
Foreground="{u:BTSBrush UI.default_text}"
|
||||
Text="Calculation" />
|
||||
<ComboBox
|
||||
Grid.Column="2"
|
||||
HorizontalAlignment="Stretch"
|
||||
|
||||
Reference in new issue
Block a user