diff --git a/src/client/spark/AW2/AnalyticsParameters/AnalyticsExpirationParametersView.xaml b/src/client/spark/AW2/AnalyticsParameters/AnalyticsExpirationParametersView.xaml index ce8bd6efc..ef96dcca7 100644 --- a/src/client/spark/AW2/AnalyticsParameters/AnalyticsExpirationParametersView.xaml +++ b/src/client/spark/AW2/AnalyticsParameters/AnalyticsExpirationParametersView.xaml @@ -9,7 +9,7 @@ xmlns:u="clr-namespace:mbts.ui" xmlns:cv="clr-namespace:mbts.ui.converters" xmlns:shell="clr-namespace:mbts.ui.shell" - Background="{StaticResource CommonBackground}"> + Background="{u:BTSBrush UI.common_background}"> - @@ -51,9 +48,6 @@ - @@ -123,6 +117,20 @@ CommandParameter="{Binding}" /> + + + + @@ -145,17 +153,23 @@ SelectedItems="{Binding selected_symbols}" HorizontalAlignment="Left" Margin="5,2,2,2" - TextBlock.Foreground="Black" HeaderContent="Symbols" - ShowSelectAll="True" - /> + ShowSelectAll="True"> + + + + + + - + - + @@ -163,8 +177,8 @@ x:Name="_grid" Grid.Row="1" ItemsSource="{Binding visible_rows}" - AlternatingRowBackground="{u:BTSColor MarketData.driver_background}" - VerticalGridLinesBrush="Gray" + Background="Transparent" + VerticalGridLinesBrush="{u:BTSColor Grid.grid_line}" EnableRowVirtualization="True" EnableColumnVirtualization="True" CanUserAddRows="False" @@ -177,35 +191,10 @@ SelectionUnit="FullRow" SelectedUnits="{Binding selected_rows}" PreviewMouseRightButtonUp="_grid_PreviewMouseRightButtonUp"> - - - - - - + @@ -318,11 +299,10 @@ + Style="{StaticResource ComboBoxCellElement}" /> @@ -340,21 +320,28 @@ - + + + + + + + + + Style="{StaticResource ComboBoxCellElement}" /> @@ -372,21 +359,28 @@ - + + + + + + + + + Style="{StaticResource ComboBoxCellElement}" /> @@ -402,9 +396,7 @@ - + @@ -415,14 +407,15 @@ Text="{Binding roll_target, Converter={StaticResource DoubleTextConverter}}" VerticalAlignment="Center" Margin="2,0,2,0" - ContextMenu="{StaticResource RollTargetContextMenu}" /> + ContextMenu="{StaticResource RollTargetContextMenu}" + Style="{StaticResource TextBlockCellElement}" /> + Text="{Binding roll_target, Converter={StaticResource DoubleTextConverter}}" + Margin="2" /> @@ -438,9 +431,7 @@ - + @@ -451,12 +442,14 @@ Text="{Binding riskless_rate, Converter={StaticResource RisklessRateConverter}}" VerticalAlignment="Center" Margin="2,0,2,0" - ContextMenu="{StaticResource RisklessRateContextMenu}" /> + ContextMenu="{StaticResource RisklessRateContextMenu}" + Style="{StaticResource TextBlockCellElement}" /> - + @@ -472,9 +465,7 @@ - + @@ -485,12 +476,14 @@ Text="{Binding settlement_price, Converter={StaticResource DoubleTextConverter}}" VerticalAlignment="Center" Margin="2,0,2,0" - ContextMenu="{StaticResource SettlementPriceContextMenu}" /> + ContextMenu="{StaticResource SettlementPriceContextMenu}" + Style="{StaticResource TextBlockCellElement}" /> - + @@ -507,9 +500,7 @@ - + @@ -520,12 +511,14 @@ Text="{Binding delta_beta, Converter={StaticResource DoubleTextConverter}}" VerticalAlignment="Center" Margin="2,0,2,0" - ContextMenu="{StaticResource DeltaBetaContextMenu}" /> + ContextMenu="{StaticResource DeltaBetaContextMenu}" + Style="{StaticResource TextBlockCellElement}" /> - + @@ -542,9 +535,7 @@ - + @@ -552,10 +543,11 @@ + Text="{Binding vega_beta, Converter={StaticResource DoubleTextConverter}}" + VerticalAlignment="Center" + Margin="2,0,2,0" + ContextMenu="{StaticResource VegaBetaContextMenu}" + Style="{StaticResource TextBlockCellElement}" /> diff --git a/src/client/spark/AW2/AnalyticsParameters/AnalyticsExpirationParametersView.xaml.cs b/src/client/spark/AW2/AnalyticsParameters/AnalyticsExpirationParametersView.xaml.cs index 82dc3355c..95d93c21b 100644 --- a/src/client/spark/AW2/AnalyticsParameters/AnalyticsExpirationParametersView.xaml.cs +++ b/src/client/spark/AW2/AnalyticsParameters/AnalyticsExpirationParametersView.xaml.cs @@ -53,6 +53,10 @@ namespace mbts.ui.shell { } : null); + public static IValueConverter expiration_is_defined_converter => + ValueConverter.create(exp => + exp is not null && exp.expiration != default); + void _grid_PreviewMouseRightButtonUp(object sender, MouseButtonEventArgs e) { Disposable.dispose(ref _context_menu_op); if (e.OriginalSource is not FrameworkElement el || DataContext is not AnalyticsExpirationParametersVM vm) { diff --git a/src/client/spark/AW2/ViewModel/Graph/VolSurfaceGraphVM.cs b/src/client/spark/AW2/ViewModel/Graph/VolSurfaceGraphVM.cs index f7b00aa0b..089cbf1bc 100644 --- a/src/client/spark/AW2/ViewModel/Graph/VolSurfaceGraphVM.cs +++ b/src/client/spark/AW2/ViewModel/Graph/VolSurfaceGraphVM.cs @@ -50,6 +50,7 @@ namespace mbts.spark { if (startup_data.vol_curve_x_axis == null) { var x_axis = BTSOxyGraphAxisDouble.Default; x_axis.name = "Strike"; + x_axis.axis_line_color = BTSColors.Graph.axis_line; x_axis.major_grid_line_color = BTSColors.Graph.grid_line; x_axis.tick_line_color = BTSColors.Graph.tick_line; x_axis.position = AxisPosition.BottomLeftToRight; @@ -63,6 +64,7 @@ namespace mbts.spark { if (startup_data.vol_curve_y_axis == null) { var y_axis = BTSOxyGraphAxisDouble.Default; y_axis.name = "Volatility"; + y_axis.axis_line_color = BTSColors.Graph.axis_line; y_axis.major_grid_line_color = BTSColors.Graph.grid_line; y_axis.tick_line_color = BTSColors.Graph.tick_line; y_axis.position = AxisPosition.LeftBottomToTop; diff --git a/src/client/spark/AW2/ViewModel/Grid/VolSurfaceColumn.cs b/src/client/spark/AW2/ViewModel/Grid/VolSurfaceColumn.cs index f2c7e4c7f..8ea196d35 100644 --- a/src/client/spark/AW2/ViewModel/Grid/VolSurfaceColumn.cs +++ b/src/client/spark/AW2/ViewModel/Grid/VolSurfaceColumn.cs @@ -73,7 +73,7 @@ namespace mbts.spark.VolSurface { var view = new TextBlock { HorizontalAlignment = HorizontalAlignment.Right, Margin = _cell_padding, - Foreground = Brushes.Blue, + Foreground = BTSColors.VolSurfaceGrid.readonly_column_foreground }; view.SetBinding(FrameworkElement.DataContextProperty, new Binding() { Converter = _data_context_converter diff --git a/src/client/spark/Images/Icons.cs b/src/client/spark/Images/Icons.cs index cd7f5e0f0..51eb4e518 100644 --- a/src/client/spark/Images/Icons.cs +++ b/src/client/spark/Images/Icons.cs @@ -270,9 +270,9 @@ namespace mbts.ui { public static ImageSource vol_surface => Math; public static ImageSource Wrench { get { return load_resource_and_freeze("Wrench"); } } public static ImageSource RightArrow => create_icon( - ArrowGeometryKey, null, new(Brushes.Black, 3)); + ArrowGeometryKey, null, new(BTSColors.UI.icon_foreground, 3)); public static ImageSource DownArrow => create_icon( - ArrowGeometryKey, null, new(Brushes.Black, 3), new RotateTransform(90, 0.5, 0.5)); + ArrowGeometryKey, null, new(BTSColors.UI.icon_foreground, 3), new RotateTransform(90, 0.5, 0.5)); public static ImageSource Factory { get { return (load_resource_and_freeze("Factory")); } } public static ImageSource DotsVertical { get { return (load_resource_and_freeze("DotsVertical")); } } public static ImageSource HandPointingOverDocument => load_resource_and_freeze("HandPointingOverDocument"); @@ -280,10 +280,10 @@ namespace mbts.ui { public static ImageSource FloppyDisk => create_icon("FloppyDisk"); static Brush _default_chevron_brush => null; - static Pen _default_chevron_pen { get; } = new Pen(Brushes.Black, 3).frozen(); + static Pen _default_chevron_pen { get; } = new Pen(BTSColors.UI.default_text, 3).frozen(); public static ImageSource create_icon(string geometric_path_key) => - create_icon(geometric_path_key, Brushes.Black); + create_icon(geometric_path_key, BTSColors.UI.icon_foreground); public static ImageSource create_icon(string geometric_path_key, Brush brush, Pen pen = null, Transform transform = null) { var rv = new DrawingImage(create_drawing(geometric_path_key, brush, pen, transform)); diff --git a/src/client/spark/Images/Vector/Icons.xaml b/src/client/spark/Images/Vector/Icons.xaml index 7420f5fc9..02773dc74 100644 --- a/src/client/spark/Images/Vector/Icons.xaml +++ b/src/client/spark/Images/Vector/Icons.xaml @@ -515,7 +515,7 @@ - + @@ -537,7 +537,7 @@ M 52.868601,3.8869994 C51.026201,3.8869996 49.534,5.3791947 49.534,7.2190399 49. M5.2010002,14.812L5.2010002,43.573997 56.098,43.573997 56.098,14.812z M0,0L63.999001,0 63.999001,48.792999 0,48.792999z"> - + @@ -549,14 +549,14 @@ M0,0L63.999001,0 63.999001,48.792999 0,48.792999z"> - - + @@ -568,7 +568,7 @@ M0,0L63.999001,0 63.999001,48.792999 0,48.792999z"> - + @@ -579,7 +579,7 @@ M0,0L63.999001,0 63.999001,48.792999 0,48.792999z"> - + @@ -589,7 +589,7 @@ M0,0L63.999001,0 63.999001,48.792999 0,48.792999z"> - + @@ -599,7 +599,7 @@ M0,0L63.999001,0 63.999001,48.792999 0,48.792999z"> - + @@ -609,7 +609,7 @@ M0,0L63.999001,0 63.999001,48.792999 0,48.792999z"> - + @@ -619,7 +619,7 @@ M0,0L63.999001,0 63.999001,48.792999 0,48.792999z"> - + @@ -629,7 +629,7 @@ M0,0L63.999001,0 63.999001,48.792999 0,48.792999z"> - + @@ -639,7 +639,7 @@ M0,0L63.999001,0 63.999001,48.792999 0,48.792999z"> - + @@ -649,7 +649,7 @@ M0,0L63.999001,0 63.999001,48.792999 0,48.792999z"> - + @@ -659,7 +659,7 @@ M0,0L63.999001,0 63.999001,48.792999 0,48.792999z"> - + @@ -683,7 +683,7 @@ M0,0L63.999001,0 63.999001,48.792999 0,48.792999z"> - + @@ -693,7 +693,7 @@ M0,0L63.999001,0 63.999001,48.792999 0,48.792999z"> - + @@ -703,7 +703,7 @@ M0,0L63.999001,0 63.999001,48.792999 0,48.792999z"> - + @@ -713,7 +713,7 @@ M0,0L63.999001,0 63.999001,48.792999 0,48.792999z"> - + @@ -723,7 +723,7 @@ M0,0L63.999001,0 63.999001,48.792999 0,48.792999z"> - @@ -734,7 +734,7 @@ M0,0L63.999001,0 63.999001,48.792999 0,48.792999z"> - + @@ -744,7 +744,7 @@ M0,0L63.999001,0 63.999001,48.792999 0,48.792999z"> - + @@ -754,7 +754,7 @@ M0,0L63.999001,0 63.999001,48.792999 0,48.792999z"> - + @@ -764,7 +764,7 @@ M0,0L63.999001,0 63.999001,48.792999 0,48.792999z"> - + @@ -774,7 +774,7 @@ M0,0L63.999001,0 63.999001,48.792999 0,48.792999z"> - + @@ -784,7 +784,7 @@ M0,0L63.999001,0 63.999001,48.792999 0,48.792999z"> - + @@ -794,7 +794,7 @@ M0,0L63.999001,0 63.999001,48.792999 0,48.792999z"> - + @@ -806,7 +806,7 @@ M0,0L63.999001,0 63.999001,48.792999 0,48.792999z"> - + @@ -818,7 +818,7 @@ M0,0L63.999001,0 63.999001,48.792999 0,48.792999z"> - - + @@ -853,7 +853,7 @@ M0,0L63.999001,0 63.999001,48.792999 0,48.792999z"> - + @@ -865,7 +865,7 @@ M0,0L63.999001,0 63.999001,48.792999 0,48.792999z"> - + @@ -877,7 +877,7 @@ M0,0L63.999001,0 63.999001,48.792999 0,48.792999z"> - + @@ -887,8 +887,8 @@ M0,0L63.999001,0 63.999001,48.792999 0,48.792999z"> - - + + @@ -928,7 +928,7 @@ M0,0L63.999001,0 63.999001,48.792999 0,48.792999z"> - + @@ -945,7 +945,7 @@ M0,0L63.999001,0 63.999001,48.792999 0,48.792999z"> - @@ -957,7 +957,7 @@ M0,0L63.999001,0 63.999001,48.792999 0,48.792999z"> - @@ -970,7 +970,7 @@ M0,0L63.999001,0 63.999001,48.792999 0,48.792999z"> @@ -983,7 +983,7 @@ M0,0L63.999001,0 63.999001,48.792999 0,48.792999z"> @@ -1020,7 +1020,7 @@ M0,0L63.999001,0 63.999001,48.792999 0,48.792999z"> @@ -1032,7 +1032,7 @@ M0,0L63.999001,0 63.999001,48.792999 0,48.792999z"> @@ -1044,7 +1044,7 @@ M0,0L63.999001,0 63.999001,48.792999 0,48.792999z"> @@ -1055,7 +1055,7 @@ M0,0L63.999001,0 63.999001,48.792999 0,48.792999z"> - @@ -1091,7 +1091,7 @@ M0,0L63.999001,0 63.999001,48.792999 0,48.792999z"> @@ -1104,7 +1104,7 @@ M0,0L63.999001,0 63.999001,48.792999 0,48.792999z"> @@ -1116,7 +1116,7 @@ M0,0L63.999001,0 63.999001,48.792999 0,48.792999z"> @@ -1128,7 +1128,7 @@ M0,0L63.999001,0 63.999001,48.792999 0,48.792999z"> @@ -1141,7 +1141,7 @@ M0,0L63.999001,0 63.999001,48.792999 0,48.792999z"> @@ -1153,7 +1153,7 @@ M0,0L63.999001,0 63.999001,48.792999 0,48.792999z"> @@ -1165,7 +1165,7 @@ M0,0L63.999001,0 63.999001,48.792999 0,48.792999z"> @@ -1178,7 +1178,7 @@ M0,0L63.999001,0 63.999001,48.792999 0,48.792999z"> @@ -1191,7 +1191,7 @@ M0,0L63.999001,0 63.999001,48.792999 0,48.792999z"> @@ -1204,7 +1204,7 @@ M0,0L63.999001,0 63.999001,48.792999 0,48.792999z"> @@ -1218,7 +1218,7 @@ M0,0L63.999001,0 63.999001,48.792999 0,48.792999z"> - + @@ -1232,7 +1232,7 @@ M0,0L63.999001,0 63.999001,48.792999 0,48.792999z"> - + @@ -1248,7 +1248,7 @@ M0,0L63.999001,0 63.999001,48.792999 0,48.792999z"> @@ -1261,7 +1261,7 @@ M0,0L63.999001,0 63.999001,48.792999 0,48.792999z"> @@ -1275,7 +1275,7 @@ M0,0L63.999001,0 63.999001,48.792999 0,48.792999z"> diff --git a/src/client/spark/Modules/Analytics/AnalyticsShellModuleView.xaml b/src/client/spark/Modules/Analytics/AnalyticsShellModuleView.xaml index 77e354b5e..f6af756a1 100644 --- a/src/client/spark/Modules/Analytics/AnalyticsShellModuleView.xaml +++ b/src/client/spark/Modules/Analytics/AnalyticsShellModuleView.xaml @@ -9,7 +9,7 @@ xmlns:shell="clr-namespace:mbts.ui.shell" xmlns:trading="clr-namespace:Spark.Trading" x:Name="me" - Background="Transparent" + Background="{u:BTSColor UI.spark_menu_background}" MinWidth="250" > @@ -19,19 +19,19 @@ - + + @@ -103,7 +103,7 @@ - - - + Command="{Binding rebuild}" Content="Rebuild" Style="{StaticResource PanelItem.Button}" /> + + + + + + + + + + + + + + + Live + Settlement + + + ATM Only + All + + + + + + diff --git a/src/client/spark/Modules/Analytics/VolSurface/View/VolSurfaceSettingsEditor.xaml b/src/client/spark/Modules/Analytics/VolSurface/View/VolSurfaceSettingsEditor.xaml index 804c37e81..1e79d1a4a 100644 --- a/src/client/spark/Modules/Analytics/VolSurface/View/VolSurfaceSettingsEditor.xaml +++ b/src/client/spark/Modules/Analytics/VolSurface/View/VolSurfaceSettingsEditor.xaml @@ -10,6 +10,7 @@ xmlns:shell="clr-namespace:mbts.ui.shell" u:WindowStyle.SizeToContent="WidthAndHeight" u:WindowStyle.AllowResize="True" + TextBlock.Foreground="{u:BTSColor UI.default_text}" Title="Vol Surface Settings" Style="{StaticResource BTSDialog}"> @@ -22,7 +23,18 @@ - + + @@ -143,8 +144,10 @@ @@ -412,6 +418,22 @@ @@ -428,21 +450,17 @@ HorizontalAlignment="Stretch" ResizeDirection="Rows" /> - +