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 @@
@@ -131,7 +131,7 @@
Margin="0,6,0,0"
Content="Slide"
IsChecked="{Binding Path='(u:ExpandCollapseAnimator.IsExpanded)', ElementName=SlideReportContent, Mode=TwoWay}"
- Style="{StaticResource LargeMenuToggleButton}"
+ Style="{StaticResource MenuToggleButton}"
/>
@@ -149,7 +149,7 @@
Margin="0,6,0,0"
Content="Combo"
IsChecked="{Binding Path='(u:ExpandCollapseAnimator.IsExpanded)', ElementName=ComboReportContent, Mode=TwoWay}"
- Style="{StaticResource LargeMenuToggleButton}"
+ Style="{StaticResource MenuToggleButton}"
/>
diff --git a/src/client/spark/Modules/Analytics/VolSurface/View/VolSurfaceDriverGridTabControl.xaml b/src/client/spark/Modules/Analytics/VolSurface/View/VolSurfaceDriverGridTabControl.xaml
index 7c2f95fd0..b3ae571cb 100644
--- a/src/client/spark/Modules/Analytics/VolSurface/View/VolSurfaceDriverGridTabControl.xaml
+++ b/src/client/spark/Modules/Analytics/VolSurface/View/VolSurfaceDriverGridTabControl.xaml
@@ -58,10 +58,9 @@
+ Margin="4"
+ ItemsSource="{Binding driver.symbols}"
+ SelectedItems="{Binding masters}">
@@ -80,10 +79,7 @@
+ Margin="4" ItemsSource="{Binding driver.symbols}" SelectedItems="{Binding fits}">
diff --git a/src/client/spark/Modules/Analytics/VolSurface/View/VolSurfaceGridSettingsEditor.xaml b/src/client/spark/Modules/Analytics/VolSurface/View/VolSurfaceGridSettingsEditor.xaml
index 5817a44ee..e79de2249 100644
--- a/src/client/spark/Modules/Analytics/VolSurface/View/VolSurfaceGridSettingsEditor.xaml
+++ b/src/client/spark/Modules/Analytics/VolSurface/View/VolSurfaceGridSettingsEditor.xaml
@@ -30,7 +30,8 @@
Grid.IsSharedSizeScope="True"
ItemsSource="{Binding columns}"
SelectionMode="Extended"
- SelectedItem="{Binding selected_column}">
+ SelectedItem="{Binding selected_column}"
+ Style="{StaticResource ListBox.Dark}">
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
- Up
- Down
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
- Live
- Settlement
-
-
- ATM Only
- All
-
-
-
-
-
-
+ 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" />
-
+
+ HorizontalAlignment="Stretch"
+ Command="{Binding commit_cmd}"
+ Content="Commit"
+ Style="{StaticResource commit_style}" />
+ Margin="0,5,0,0"
+ DataContext="{Binding macro_actions}"
+ Width="107"
+ IsEnabled="{Binding DataContext.any_masters_selected, ElementName=macro_grid}" />
@@ -517,6 +535,7 @@
x:Name="vol_curve_plot_view"
Grid.Row="2"
Grid.ColumnSpan="3"
+ Background="Transparent"
Model="{Binding graph_vm.plot_model}"
MouseDoubleClick="_on_graph_mouse_double_click">
@@ -589,7 +608,7 @@
diff --git a/src/client/spark/Modules/Analytics/VolSurface/VolSurfaceWindow.cs b/src/client/spark/Modules/Analytics/VolSurface/VolSurfaceWindow.cs
index c12814b50..99f60c08b 100644
--- a/src/client/spark/Modules/Analytics/VolSurface/VolSurfaceWindow.cs
+++ b/src/client/spark/Modules/Analytics/VolSurface/VolSurfaceWindow.cs
@@ -55,8 +55,10 @@
_main_win = new Window {
Content = new VolSurfaceView {
DataContext = _vm
- }
+ },
+ Style = Application.Current.TryFindResource("BTSWindow") as Style
};
+ ui.WindowStyle.SetAllowResize(_main_win, true);
hooks += this.observe_title().OnDispatcher().Subscribe(title => _main_win.Title = title);
hooks += _main_win.SubscribeClosed((s, e) => {
Disposable.dispose(ref hooks);
diff --git a/src/client/spark/Modules/Market/MarketView/MarketViewRowAnimationModel.cs b/src/client/spark/Modules/Market/MarketView/MarketViewRowAnimationModel.cs
index 4eb745cbe..3c907ee0d 100644
--- a/src/client/spark/Modules/Market/MarketView/MarketViewRowAnimationModel.cs
+++ b/src/client/spark/Modules/Market/MarketView/MarketViewRowAnimationModel.cs
@@ -19,10 +19,10 @@ namespace mbts.spark {
position_decrease = new(ColType.Position, CellAnimation.Type.DownArrow, Brushes.Red),
day_change_increase = new(ColType.DayChange, CellAnimation.Type.UpArrow, Brushes.Green),
day_change_decrease = new(ColType.DayChange, CellAnimation.Type.DownArrow, Brushes.Red),
- working_bids_active = new(ColType.WorkingBids, CellAnimation.Type.Border, BTSColors.warning.to_brush()),
+ working_bids_active = new(ColType.WorkingBids, CellAnimation.Type.Border, BTSColors.UI.warning.to_brush()),
working_bids_inside = new(ColType.WorkingBids, CellAnimation.Type.Border, BTSColors.MarketData.bid.to_brush()),
working_bids_filled = new(ColType.WorkingBids, CellAnimation.Type.Border, Brushes.Green),
- working_asks_active = new(ColType.WorkingAsks, CellAnimation.Type.Border, BTSColors.warning.to_brush()),
+ working_asks_active = new(ColType.WorkingAsks, CellAnimation.Type.Border, BTSColors.UI.warning.to_brush()),
working_asks_inside = new(ColType.WorkingAsks, CellAnimation.Type.Border, BTSColors.MarketData.ask.to_brush()),
working_asks_filled = new(ColType.WorkingAsks, CellAnimation.Type.Border, Brushes.Red)
};
diff --git a/src/client/spark/Modules/Market/MarketView/MarketViewSettings.cs b/src/client/spark/Modules/Market/MarketView/MarketViewSettings.cs
index d9e01baaa..fd5e6af81 100644
--- a/src/client/spark/Modules/Market/MarketView/MarketViewSettings.cs
+++ b/src/client/spark/Modules/Market/MarketView/MarketViewSettings.cs
@@ -107,15 +107,15 @@ namespace bts.shell.market_view {
Columns.Bid,
ColHeader.Bid,
ColWidth.MViewPrice,
- fg: BTSColors.header_text,
- bg: BTSColors.MarketData.bid);
+ fg: BTSColors.MarketData.bid,
+ bg: BTSColors.Grid.dark_column_background);
public static GridColumnSettings ask => _mk(
Columns.Ask,
ColHeader.Ask,
ColWidth.MViewPrice,
- fg: BTSColors.header_text,
- bg: BTSColors.MarketData.ask);
+ fg: BTSColors.MarketData.ask,
+ bg: BTSColors.Grid.dark_column_background);
public static GridColumnSettings ask_merged_size => _mk(Columns.AskMergedQty, ColHeader.MergedQty, ColWidth.MergedQty, fg: BTSColors.MarketData.ask);
public static GridColumnSettings ask_direct_size => _mk(Columns.AskDirectQty, ColHeader.DirectQty, ColWidth.MergedQty, fg: BTSColors.MarketData.ask);
diff --git a/src/client/spark/Modules/Market/MarketView/MarketViewView.xaml b/src/client/spark/Modules/Market/MarketView/MarketViewView.xaml
index 99e9e40ef..a36a3129d 100644
--- a/src/client/spark/Modules/Market/MarketView/MarketViewView.xaml
+++ b/src/client/spark/Modules/Market/MarketView/MarketViewView.xaml
@@ -10,7 +10,7 @@
xmlns:usp="clr-namespace:mbts.ui.spark"
u:WindowStyle.UnsafeWindow="{Binding Path='(u:WindowStyle.UnsafeWindow)', RelativeSource={RelativeSource AncestorType=bv:SparkWindowView}}"
FocusManager.IsFocusScope="True"
- Background="{StaticResource CommonBackground}"
+ Background="{u:BTSBrush UI.common_background}"
>
diff --git a/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesView.xaml b/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesView.xaml
index f083c46e8..e6928a451 100644
--- a/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesView.xaml
+++ b/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesView.xaml
@@ -3,10 +3,11 @@
x:ClassModifier="internal"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ xmlns:u="clr-namespace:mbts.ui"
xmlns:c="clr-namespace:mbts.ui.controls"
xmlns:tas="clr-namespace:bts.shell.time_and_sales"
FocusManager.IsFocusScope="True"
- Background="{StaticResource CommonBackground}"
+ Background="{u:BTSBrush UI.Window.normal_background}"
>
diff --git a/src/client/spark/Modules/Spreader/SyntheticManagementView.xaml b/src/client/spark/Modules/Spreader/SyntheticManagementView.xaml
index 78e6570b9..751b76940 100644
--- a/src/client/spark/Modules/Spreader/SyntheticManagementView.xaml
+++ b/src/client/spark/Modules/Spreader/SyntheticManagementView.xaml
@@ -4,9 +4,9 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:usp="clr-namespace:mbts.ui.spark"
+ xmlns:u="clr-namespace:mbts.ui"
xmlns:c="clr-namespace:mbts.ui.controls"
- Background="{StaticResource CommonBackground}"
- >
+ Background="{u:BTSBrush UI.Window.normal_background}">
diff --git a/src/client/spark/Modules/Trading/AlgoStudio/AlgoStudioView.xaml b/src/client/spark/Modules/Trading/AlgoStudio/AlgoStudioView.xaml
index 2c322a7f9..6e38320e0 100644
--- a/src/client/spark/Modules/Trading/AlgoStudio/AlgoStudioView.xaml
+++ b/src/client/spark/Modules/Trading/AlgoStudio/AlgoStudioView.xaml
@@ -13,7 +13,7 @@
xmlns:uspcv="clr-namespace:mbts.ui.spark.converters"
xmlns:sys="clr-namespace:System;assembly=mscorlib"
u:StateManager.VisualState="{Binding selected_definition.algo_root, Converter={x:Static usp:AlgoStudioView.EditPaneVisualStateConverter}}"
- Background="{StaticResource CommonBackground}"
+ Background="{u:BTSBrush UI.common_background}"
>
@@ -60,7 +60,7 @@
diff --git a/src/client/spark/Modules/Trading/Ladder/View/LadderView.xaml b/src/client/spark/Modules/Trading/Ladder/View/LadderView.xaml
index 3678abf72..d43820fef 100644
--- a/src/client/spark/Modules/Trading/Ladder/View/LadderView.xaml
+++ b/src/client/spark/Modules/Trading/Ladder/View/LadderView.xaml
@@ -14,7 +14,7 @@
xmlns:sys="clr-namespace:System;assembly=mscorlib"
Height="600"
Width="420"
- Background="{u:BTSBrush common_background}"
+ Background="{u:BTSBrush UI.common_background}"
TextElement.FontSize="{x:Static u:FontSizes.Small}">
@@ -171,7 +171,7 @@
-
@@ -191,7 +191,7 @@
HorizontalAlignment="Left"
VerticalAlignment="Stretch"
Width="{StaticResource GridSplitterWidth}"
- BorderThickness="1,0,0,0"
+ BorderThickness="0"
BorderBrush="{u:BTSColor UI.form_content_border}"
Visibility="Collapsed"
>
@@ -209,7 +209,7 @@
Panel.ZIndex="1"
HorizontalAlignment="Right"
Width="7"
- BorderThickness="1"
+ BorderThickness="0"
IsChecked="{Binding show_right_panel}"
>
@@ -255,7 +255,11 @@
-
+
@@ -416,9 +420,7 @@
Grid.Column="1"
HorizontalAlignment="Stretch"
ItemContainerStyle="{StaticResource RightPanel.MenuItem}"
- BorderBrush="DarkGray"
- BorderThickness="1"
- >
+ BorderThickness="0">
@@ -497,16 +499,23 @@
-
- (No orders are selected)
-
+
+
+
+ Style="{StaticResource TextBlock.Dark}" />
+
@@ -646,7 +655,7 @@
HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"
Height="{x:Static sp:OrderBookView.GridSplitterHeight}"
- BorderThickness="0,1,0,0"
+ BorderThickness="0"
ResizeBehavior="PreviousAndNext"
Visibility="Collapsed" />
diff --git a/src/client/spark/Modules/Trading/OrderBook/View/OrderBookView.xaml.cs b/src/client/spark/Modules/Trading/OrderBook/View/OrderBookView.xaml.cs
index 7aaf3e5a4..5686d46b4 100644
--- a/src/client/spark/Modules/Trading/OrderBook/View/OrderBookView.xaml.cs
+++ b/src/client/spark/Modules/Trading/OrderBook/View/OrderBookView.xaml.cs
@@ -196,7 +196,7 @@ namespace mbts.spark {
orders_grid, orders_grid,
new Border {
Child = grid,
- Background = BTSColors.common_background.to_brush(),
+ Background = BTSColors.UI.common_background.to_brush(),
BorderBrush = Brushes.Black,
BorderThickness = new Thickness(1)
},
diff --git a/src/client/spark/Modules/Trading/PNL/View/PNLAuxiliaryPopupView.xaml b/src/client/spark/Modules/Trading/PNL/View/PNLAuxiliaryPopupView.xaml
index 173d6deb8..b3baa77da 100644
--- a/src/client/spark/Modules/Trading/PNL/View/PNLAuxiliaryPopupView.xaml
+++ b/src/client/spark/Modules/Trading/PNL/View/PNLAuxiliaryPopupView.xaml
@@ -7,7 +7,7 @@
xmlns:u="clr-namespace:mbts.ui"
xmlns:usp="clr-namespace:mbts.ui.spark"
xmlns:sp="clr-namespace:mbts.spark"
- Background="{StaticResource CommonBackground}"
+ Background="{u:BTSBrush UI.common_background}"
BorderBrush="Black"
BorderThickness="1"
MaxHeight="300"
diff --git a/src/client/spark/Modules/Trading/PNL/View/PNLView.xaml b/src/client/spark/Modules/Trading/PNL/View/PNLView.xaml
index 7fc32a3e1..a20eec689 100644
--- a/src/client/spark/Modules/Trading/PNL/View/PNLView.xaml
+++ b/src/client/spark/Modules/Trading/PNL/View/PNLView.xaml
@@ -11,7 +11,7 @@
xmlns:usp="clr-namespace:mbts.ui.spark"
xmlns:sys="clr-namespace:System;assembly=mscorlib"
FocusManager.IsFocusScope="True"
- Background="{StaticResource CommonBackground}"
+ Background="{u:BTSBrush UI.common_background}"
Tag="{Binding ElementName=_grid}"
>
diff --git a/src/client/spark/Modules/Trading/ReconcileReport/ReconcileReportView.xaml b/src/client/spark/Modules/Trading/ReconcileReport/ReconcileReportView.xaml
index 4391cdc7e..fe5a5070e 100644
--- a/src/client/spark/Modules/Trading/ReconcileReport/ReconcileReportView.xaml
+++ b/src/client/spark/Modules/Trading/ReconcileReport/ReconcileReportView.xaml
@@ -13,7 +13,7 @@
xmlns:sys="clr-namespace:System;assembly=System.Runtime"
u:WindowStyle.UnsafeWindow="{Binding Path='(u:WindowStyle.UnsafeWindow)', RelativeSource={RelativeSource AncestorType=bv:SparkWindowView}}"
FocusManager.IsFocusScope="True"
- Background="{StaticResource CommonBackground}">
+ Background="{u:BTSBrush UI.common_background}">
diff --git a/src/client/spark/Orders/OrderDataHelper.cs b/src/client/spark/Orders/OrderDataHelper.cs
index ae6de1b4f..4e06b5065 100644
--- a/src/client/spark/Orders/OrderDataHelper.cs
+++ b/src/client/spark/Orders/OrderDataHelper.cs
@@ -156,32 +156,29 @@ namespace mbts.spark.utilities {
public SpreaderOrderDefinitionImmutable spreader_orderi(SecurityImmutable security, ExecutionStrategyImmutable strategy) => new SpreaderOrderDefinitionImmutable(spreader_order(security, strategy));
public OrderMetadata get_metadata(OrderRecordImmutable order) => get_metadata(order.Def.CustomDef.CustomCase);
- public OrderMetadata get_metadata(CustomOrderDefinition.CustomOneofCase order_type) {
- switch (order_type) {
- case CustomOrderDefinition.CustomOneofCase.Market: return new OrderMetadata { KeyBinding = "M", Color = BTSColors.yellow.rgb_color(), NoProps = true };
- case CustomOrderDefinition.CustomOneofCase.Limit: return new OrderMetadata { KeyBinding = "L", Color = BTSColors.green.rgb_color(), NoProps = true };
- case CustomOrderDefinition.CustomOneofCase.Stop: return new OrderMetadata { KeyBinding = "S", Color = BTSColors.red_orange.rgb_color(), NoProps = true };
- case CustomOrderDefinition.CustomOneofCase.StopLimit: return new OrderMetadata { KeyBinding = "SL", Color = BTSColors.pale_green.rgb_color() };
- case CustomOrderDefinition.CustomOneofCase.GlbxIceberg: return new OrderMetadata { KeyBinding = "GB", Color = BTSColors.Orders.glbx_iceberg_order };
- case CustomOrderDefinition.CustomOneofCase.Iceberg: return new OrderMetadata { KeyBinding = "I", Color = BTSColors.pale_blue.rgb_color() };
- case CustomOrderDefinition.CustomOneofCase.TimeBox: return new OrderMetadata { KeyBinding = "TB", Color = BTSColors.purple.rgb_color() };
- case CustomOrderDefinition.CustomOneofCase.Tick: return new OrderMetadata { KeyBinding = "T", Color = BTSColors.Orders.tick_order };
- case CustomOrderDefinition.CustomOneofCase.Lean: return new OrderMetadata { KeyBinding = "L", Color = BTSColors.Orders.lean_order };
- case CustomOrderDefinition.CustomOneofCase.Join: return new OrderMetadata { KeyBinding = "J", Color = BTSColors.Orders.join_order };
- case CustomOrderDefinition.CustomOneofCase.Top: return new OrderMetadata { KeyBinding = "D", Color = BTSColors.Orders.top_order };
- case CustomOrderDefinition.CustomOneofCase.Cover: return new OrderMetadata { KeyBinding = "C", Color = BTSColors.Orders.cover_order };
- case CustomOrderDefinition.CustomOneofCase.Oco: return new OrderMetadata { KeyBinding = "C", Color = BTSColors.Orders.oco_order };
- case CustomOrderDefinition.CustomOneofCase.Pricer: return new OrderMetadata { KeyBinding = "C", Color = BTSColors.Orders.pricer_order };
- case CustomOrderDefinition.CustomOneofCase.Offset: return new OrderMetadata { KeyBinding = "O", Color = BTSColors.Orders.off_order };
- case CustomOrderDefinition.CustomOneofCase.Trigger: return new OrderMetadata { KeyBinding = "T", Color = BTSColors.Orders.trigger_order };
- case CustomOrderDefinition.CustomOneofCase.Spreader: return new OrderMetadata { KeyBinding = "", Color = BTSColors.Orders.spreader_order };
- // case CustomOrderDefinition.CustomOneofCase.Splitter: return new OrderMetadata { KeyBinding = "", Color = BTSColors.orange.rgb_color() };
- case CustomOrderDefinition.CustomOneofCase.Dynamic: return new OrderMetadata { KeyBinding = "", Color = BTSColors.Orders.top_order };
- case CustomOrderDefinition.CustomOneofCase.None: goto default;
- //case CustomOrderDefinition.CustomOneofCase.QueueHolder: return new OrderMetadata { KeyBinding = "Q", Color = BTSColors.purple.rgb_color() };
- default: return _default_order_metadata;
- }
- }
+
+ public OrderMetadata get_metadata(CustomOrderDefinition.CustomOneofCase order_type) =>
+ order_type switch {
+ CustomOrderDefinition.CustomOneofCase.Market => new() { KeyBinding = "M", Color = BTSColors.Orders.market_order, NoProps = true },
+ CustomOrderDefinition.CustomOneofCase.Limit => new() { KeyBinding = "L", Color = BTSColors.Orders.limit_order, NoProps = true },
+ CustomOrderDefinition.CustomOneofCase.Stop => new() { KeyBinding = "S", Color = BTSColors.Orders.stop_order, NoProps = true },
+ CustomOrderDefinition.CustomOneofCase.StopLimit => new() { KeyBinding = "SL", Color = BTSColors.Orders.stop_limit_order },
+ CustomOrderDefinition.CustomOneofCase.GlbxIceberg => new() { KeyBinding = "GB", Color = BTSColors.Orders.glbx_iceberg_order },
+ CustomOrderDefinition.CustomOneofCase.Iceberg => new() { KeyBinding = "I", Color = BTSColors.Orders.iceberg_order },
+ CustomOrderDefinition.CustomOneofCase.TimeBox => new() { KeyBinding = "TB", Color = BTSColors.Orders.time_box_order },
+ CustomOrderDefinition.CustomOneofCase.Tick => new() { KeyBinding = "T", Color = BTSColors.Orders.tick_order },
+ CustomOrderDefinition.CustomOneofCase.Lean => new() { KeyBinding = "L", Color = BTSColors.Orders.lean_order },
+ CustomOrderDefinition.CustomOneofCase.Join => new() { KeyBinding = "J", Color = BTSColors.Orders.join_order },
+ CustomOrderDefinition.CustomOneofCase.Top => new() { KeyBinding = "D", Color = BTSColors.Orders.top_order },
+ CustomOrderDefinition.CustomOneofCase.Cover => new() { KeyBinding = "C", Color = BTSColors.Orders.cover_order },
+ CustomOrderDefinition.CustomOneofCase.Oco => new() { KeyBinding = "C", Color = BTSColors.Orders.oco_order },
+ CustomOrderDefinition.CustomOneofCase.Pricer => new() { KeyBinding = "C", Color = BTSColors.Orders.pricer_order },
+ CustomOrderDefinition.CustomOneofCase.Offset => new() { KeyBinding = "O", Color = BTSColors.Orders.off_order },
+ CustomOrderDefinition.CustomOneofCase.Trigger => new() { KeyBinding = "T", Color = BTSColors.Orders.trigger_order },
+ CustomOrderDefinition.CustomOneofCase.Spreader => new() { KeyBinding = "", Color = BTSColors.Orders.spreader_order },
+ CustomOrderDefinition.CustomOneofCase.Dynamic => new() { KeyBinding = "", Color = BTSColors.Orders.top_order },
+ _ => _default_order_metadata
+ };
public void Dispose() =>
Disposable.dispose(ref _dispose);
@@ -367,30 +364,28 @@ namespace mbts.spark.utilities {
_algo_type_case_descriptor_data.TryGetValue(algo_type, out AlgoTypeCaseDescriptorData d) ? d.child_algo_data : Array.Empty();
#endregion
- public static OrderMetadata get_metadata(CustomOrderDefinition.CustomOneofCase order_type) {
- switch (order_type) {
- case CustomOrderDefinition.CustomOneofCase.Market: return new OrderMetadata { KeyBinding = "M", Color = BTSColors.yellow.rgb_color(), NoProps = true };
- case CustomOrderDefinition.CustomOneofCase.Limit: return new OrderMetadata { KeyBinding = "L", Color = BTSColors.green.rgb_color(), NoProps = true };
- case CustomOrderDefinition.CustomOneofCase.Stop: return new OrderMetadata { KeyBinding = "S", Color = BTSColors.red_orange.rgb_color(), NoProps = true };
- case CustomOrderDefinition.CustomOneofCase.StopLimit: return new OrderMetadata { KeyBinding = "SL", Color = BTSColors.pale_green.rgb_color() };
- case CustomOrderDefinition.CustomOneofCase.GlbxIceberg: return new OrderMetadata { KeyBinding = "GB", Color = BTSColors.Orders.glbx_iceberg_order };
- case CustomOrderDefinition.CustomOneofCase.Iceberg: return new OrderMetadata { KeyBinding = "I", Color = BTSColors.pale_blue.rgb_color() };
- case CustomOrderDefinition.CustomOneofCase.TimeBox: return new OrderMetadata { KeyBinding = "TB", Color = BTSColors.purple.rgb_color() };
- case CustomOrderDefinition.CustomOneofCase.Tick: return new OrderMetadata { KeyBinding = "T", Color = BTSColors.Orders.tick_order };
- case CustomOrderDefinition.CustomOneofCase.Lean: return new OrderMetadata { KeyBinding = "L", Color = BTSColors.Orders.lean_order };
- case CustomOrderDefinition.CustomOneofCase.Join: return new OrderMetadata { KeyBinding = "J", Color = BTSColors.Orders.join_order };
- case CustomOrderDefinition.CustomOneofCase.Top: return new OrderMetadata { KeyBinding = "D", Color = BTSColors.Orders.top_order };
- case CustomOrderDefinition.CustomOneofCase.Cover: return new OrderMetadata { KeyBinding = "C", Color = BTSColors.Orders.cover_order };
- case CustomOrderDefinition.CustomOneofCase.Oco: return new OrderMetadata { KeyBinding = "C", Color = BTSColors.Orders.oco_order };
- case CustomOrderDefinition.CustomOneofCase.Pricer: return new OrderMetadata { KeyBinding = "C", Color = BTSColors.Orders.pricer_order };
- case CustomOrderDefinition.CustomOneofCase.Offset: return new OrderMetadata { KeyBinding = "O", Color = BTSColors.Orders.off_order };
- case CustomOrderDefinition.CustomOneofCase.Trigger: return new OrderMetadata { KeyBinding = "T", Color = BTSColors.Orders.trigger_order };
- case CustomOrderDefinition.CustomOneofCase.Spreader: return new OrderMetadata { KeyBinding = "", Color = BTSColors.Orders.spreader_order };
- case CustomOrderDefinition.CustomOneofCase.Dynamic: return new OrderMetadata { KeyBinding = "", Color = BTSColors.Orders.top_order };
- case CustomOrderDefinition.CustomOneofCase.None:
- default: return _default_order_metadata;
- }
- }
+ public static OrderMetadata get_metadata(CustomOrderDefinition.CustomOneofCase order_type) =>
+ order_type switch {
+ CustomOrderDefinition.CustomOneofCase.Market => new() { KeyBinding = "M", Color = BTSColors.Orders.market_order, NoProps = true },
+ CustomOrderDefinition.CustomOneofCase.Limit => new() { KeyBinding = "L", Color = BTSColors.Orders.limit_order, NoProps = true },
+ CustomOrderDefinition.CustomOneofCase.Stop => new() { KeyBinding = "S", Color = BTSColors.Orders.stop_order, NoProps = true },
+ CustomOrderDefinition.CustomOneofCase.StopLimit => new() { KeyBinding = "SL", Color = BTSColors.Orders.stop_limit_order },
+ CustomOrderDefinition.CustomOneofCase.GlbxIceberg => new() { KeyBinding = "GB", Color = BTSColors.Orders.glbx_iceberg_order },
+ CustomOrderDefinition.CustomOneofCase.Iceberg => new() { KeyBinding = "I", Color = BTSColors.Orders.iceberg_order },
+ CustomOrderDefinition.CustomOneofCase.TimeBox => new() { KeyBinding = "TB", Color = BTSColors.Orders.time_box_order },
+ CustomOrderDefinition.CustomOneofCase.Tick => new() { KeyBinding = "T", Color = BTSColors.Orders.tick_order },
+ CustomOrderDefinition.CustomOneofCase.Lean => new() { KeyBinding = "L", Color = BTSColors.Orders.lean_order },
+ CustomOrderDefinition.CustomOneofCase.Join => new() { KeyBinding = "J", Color = BTSColors.Orders.join_order },
+ CustomOrderDefinition.CustomOneofCase.Top => new() { KeyBinding = "D", Color = BTSColors.Orders.top_order },
+ CustomOrderDefinition.CustomOneofCase.Cover => new() { KeyBinding = "C", Color = BTSColors.Orders.cover_order },
+ CustomOrderDefinition.CustomOneofCase.Oco => new() { KeyBinding = "C", Color = BTSColors.Orders.oco_order },
+ CustomOrderDefinition.CustomOneofCase.Pricer => new() { KeyBinding = "C", Color = BTSColors.Orders.pricer_order },
+ CustomOrderDefinition.CustomOneofCase.Offset => new() { KeyBinding = "O", Color = BTSColors.Orders.off_order },
+ CustomOrderDefinition.CustomOneofCase.Trigger => new() { KeyBinding = "T", Color = BTSColors.Orders.trigger_order },
+ CustomOrderDefinition.CustomOneofCase.Spreader => new() { KeyBinding = "", Color = BTSColors.Orders.spreader_order },
+ CustomOrderDefinition.CustomOneofCase.Dynamic => new() { KeyBinding = "", Color = BTSColors.Orders.dynamic_order },
+ _ => _default_order_metadata,
+ };
public static string abbreviate_algo_type(CustomOrderDefinition.CustomOneofCase algo_type) {
switch (algo_type) {
diff --git a/src/client/spark/Orders/OrderModificationDialog.xaml b/src/client/spark/Orders/OrderModificationDialog.xaml
index 2cf949e22..ebf013731 100644
--- a/src/client/spark/Orders/OrderModificationDialog.xaml
+++ b/src/client/spark/Orders/OrderModificationDialog.xaml
@@ -73,7 +73,10 @@
-
+
diff --git a/src/client/spark/Orders/OrderTicket.xaml b/src/client/spark/Orders/OrderTicket.xaml
index 8163b66dc..3be2ac35e 100644
--- a/src/client/spark/Orders/OrderTicket.xaml
+++ b/src/client/spark/Orders/OrderTicket.xaml
@@ -28,7 +28,7 @@
- Sell
+
@@ -69,7 +69,7 @@
- Buy
+
@@ -123,9 +123,9 @@
-
+
-
+
diff --git a/src/client/spark/Risk/Combo/ComboReportConfigurationView.xaml b/src/client/spark/Risk/Combo/ComboReportConfigurationView.xaml
index a3158294c..192360526 100644
--- a/src/client/spark/Risk/Combo/ComboReportConfigurationView.xaml
+++ b/src/client/spark/Risk/Combo/ComboReportConfigurationView.xaml
@@ -29,8 +29,13 @@
- Name
-
+
+
Internal Account
diff --git a/src/client/spark/Risk/Combo/ComboReportView.xaml b/src/client/spark/Risk/Combo/ComboReportView.xaml
index 58a3ea368..c5c20cf20 100644
--- a/src/client/spark/Risk/Combo/ComboReportView.xaml
+++ b/src/client/spark/Risk/Combo/ComboReportView.xaml
@@ -8,7 +8,7 @@
xmlns:c="clr-namespace:mbts.ui.controls"
xmlns:cv="clr-namespace:mbts.ui.converters"
xmlns:analytics="clr-namespace:mbts.analytics"
- Background="{StaticResource CommonBackground}"
+ Background="{u:BTSBrush UI.common_background}"
>
@@ -76,6 +76,7 @@
diff --git a/src/client/spark/Risk/Slide/SlideReportConfigurationView.xaml b/src/client/spark/Risk/Slide/SlideReportConfigurationView.xaml
index a97b66ef8..152737a1b 100644
--- a/src/client/spark/Risk/Slide/SlideReportConfigurationView.xaml
+++ b/src/client/spark/Risk/Slide/SlideReportConfigurationView.xaml
@@ -28,7 +28,7 @@
12
12
-
+
+
@@ -90,6 +101,8 @@
@@ -115,7 +128,7 @@
Validation.ErrorTemplate="{x:Null}"
ItemsSource="{Binding internal_accounts}"
SelectedItem="{Binding internal_account}"
- Style="{StaticResource ParameterValue}"/>
+ Style="{StaticResource ParameterValueComboBox}"/>
@@ -132,10 +145,12 @@
+ Style="{StaticResource ParameterValueComboBox}" />
@@ -155,7 +170,7 @@
Validation.ErrorTemplate="{x:Null}"
ItemsSource="{Binding option_equivalence_choices}"
SelectedItem="{Binding option_equivalence}"
- Style="{StaticResource ParameterValue}" />
+ Style="{StaticResource ParameterValueComboBox}" />
@@ -176,7 +191,7 @@
ItemsSource="{Binding vol_surfaces}"
SelectedItem="{Binding selected_vol_surface}"
DisplayMemberPath="name"
- Style="{StaticResource ParameterValue}"/>
+ Style="{StaticResource ParameterValueComboBox}"/>
@@ -195,7 +210,7 @@
Grid.Column="1"
ItemsSource="{Binding calculation_modes}"
SelectedItem="{Binding calculation_mode}"
- Style="{StaticResource ParameterValue}">
+ Style="{StaticResource ParameterValueComboBox}">
diff --git a/src/client/spark/Risk/Slide/SlideReportGridSettingsView.xaml b/src/client/spark/Risk/Slide/SlideReportGridSettingsView.xaml
index d547cf6d8..008f4cd34 100644
--- a/src/client/spark/Risk/Slide/SlideReportGridSettingsView.xaml
+++ b/src/client/spark/Risk/Slide/SlideReportGridSettingsView.xaml
@@ -3,6 +3,7 @@
x:ClassModifier="internal"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ xmlns:u="clr-namespace:mbts.ui"
xmlns:c="clr-namespace:mbts.ui.controls"
Width="350">
@@ -10,6 +11,7 @@
+
@@ -26,11 +28,12 @@
ItemsSource="{Binding greek_views}"
SelectionMode="Extended"
SelectedValuePath="value"
- SelectedValue="{Binding top_selected_greek}">
+ SelectedValue="{Binding top_selected_greek}"
+ >
@@ -72,30 +75,44 @@
-
+
-
+
-
+
diff --git a/src/client/spark/Risk/Slide/SlideReportSettingsView.xaml b/src/client/spark/Risk/Slide/SlideReportSettingsView.xaml
index 0c1d92501..e21238b18 100644
--- a/src/client/spark/Risk/Slide/SlideReportSettingsView.xaml
+++ b/src/client/spark/Risk/Slide/SlideReportSettingsView.xaml
@@ -68,20 +68,32 @@
-
+
-
+
diff --git a/src/client/spark/Risk/Slide/SlideReportView.xaml b/src/client/spark/Risk/Slide/SlideReportView.xaml
index f9b5c7bdc..a683be178 100644
--- a/src/client/spark/Risk/Slide/SlideReportView.xaml
+++ b/src/client/spark/Risk/Slide/SlideReportView.xaml
@@ -7,8 +7,7 @@
xmlns:u="clr-namespace:mbts.ui"
xmlns:c="clr-namespace:mbts.ui.controls"
xmlns:cv="clr-namespace:mbts.ui.converters"
- Background="{StaticResource CommonBackground}"
->
+ Background="{u:BTSBrush UI.common_background}">
@@ -38,7 +37,7 @@
-
+
@@ -54,13 +53,28 @@
RelativeSource={RelativeSource AncestorType=c:DataGridEx},
Converter={StaticResource OverridesActiveBrushConverter}}"
/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -189,7 +293,8 @@
PopupAnimation="None"
>
@@ -211,11 +316,16 @@
+ x:Name="toggleButton"
+ Grid.ColumnSpan="2"
+ Background="{TemplateBinding Background}"
+ BorderBrush="{TemplateBinding BorderBrush}"
+ BorderThickness="{TemplateBinding BorderThickness}"
+ IsChecked="{Binding
+ IsDropDownOpen,
+ Mode=TwoWay,
+ RelativeSource={RelativeSource TemplatedParent}}"
+ Style="{StaticResource ComboBoxToggleButton}" />
@@ -304,21 +415,22 @@
Background="{TemplateBinding Background}" Style="{StaticResource ComboBoxToggleButton}"
IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
/>
-
+
+ x:Name="PART_EditableTextBox"
+ HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+ VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+ Margin="{TemplateBinding Padding}"
+ Background="Transparent"
+ Foreground="{TemplateBinding Foreground}"
+ IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}"
+ Style="{StaticResource ComboBoxEditableTextBox}" />
-
-
-
@@ -336,12 +448,68 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -481,6 +791,51 @@
+
+
+
+
+
+
+
+
-
-
-
-
+
diff --git a/src/client/spark/view/Controls/BusySpinner.xaml b/src/client/spark/view/Controls/BusySpinner.xaml
index 133a12b5c..0e946b84a 100644
--- a/src/client/spark/view/Controls/BusySpinner.xaml
+++ b/src/client/spark/view/Controls/BusySpinner.xaml
@@ -2,6 +2,7 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+ xmlns:u="clr-namespace:mbts.ui"
xmlns:ui="clr-namespace:mbts.ui"
xmlns:core="clr-namespace:mbts.ui"
xmlns:converter="clr-namespace:mbts.ui.converters"
@@ -14,14 +15,76 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -76,7 +139,7 @@
+
+
diff --git a/src/client/spark/view/Controls/ColorPicker/Code/ColorPalette.cs b/src/client/spark/view/Controls/ColorPicker/Code/ColorPalette.cs
index 04ae971c2..a278a4796 100644
--- a/src/client/spark/view/Controls/ColorPicker/Code/ColorPalette.cs
+++ b/src/client/spark/view/Controls/ColorPicker/Code/ColorPalette.cs
@@ -25,7 +25,6 @@ namespace mbts.ui.controls.color_picker {
if (order_factory != null)
yield return factory_order_colors_palette(order_factory);
yield return application_palette();
- yield return bts_palette();
yield return blank_palette();
}
@@ -78,37 +77,19 @@ namespace mbts.ui.controls.color_picker {
new ColorPalette {
group = "Application",
colors = new List {
- new NamedColor(BTSColors.accent_dark, "Shell Accent Dark"),
- new NamedColor(BTSColors.accent_light, "Shell Accent Light"),
- new NamedColor(BTSColors.success, "Success"),
- new NamedColor(BTSColors.warning, "Warning"),
- new NamedColor(BTSColors.danger, "Danger"),
- new NamedColor(BTSColors.logo, "Logo"),
- new NamedColor(BTSColors.brand_lightest, "Brand Lightest"),
- new NamedColor(BTSColors.brand_lighter, "Brand Lighter"),
- new NamedColor(BTSColors.brand_light, "Brand Light"),
- new NamedColor(BTSColors.brand_medium, "Brand Medium"),
- new NamedColor(BTSColors.brand_dark, "Brand Dark"),
- new NamedColor(BTSColors.brand_darker, "Brand Darker"),
- new NamedColor(BTSColors.brand_darkest, "Brand Darkest"),
- }
- };
-
- public static ColorPalette bts_palette() =>
- new ColorPalette {
- group = "BTS",
- colors = new List {
- new NamedColor(BTSColors.red_orange, "Red Orange"),
- new NamedColor(BTSColors.blue, "Blue"),
- new NamedColor(BTSColors.yellow, "Yellow"),
- new NamedColor(BTSColors.green, "Green"),
- new NamedColor(BTSColors.orange, "Orange"),
- new NamedColor(BTSColors.pale_blue, "Pale Blue"),
- new NamedColor(BTSColors.red, "Red"),
- new NamedColor(BTSColors.pale_green, "Pale Green"),
- new NamedColor(BTSColors.purple, "Purple"),
- new NamedColor(BTSColors.teal, "Teal"),
- new NamedColor(BTSColors.olive, "Olive")
+ new NamedColor(BTSColors.Brand.accent_dark, "Shell Accent Dark"),
+ new NamedColor(BTSColors.Brand.accent_light, "Shell Accent Light"),
+ new NamedColor(BTSColors.UI.success, "Success"),
+ new NamedColor(BTSColors.UI.warning, "Warning"),
+ new NamedColor(BTSColors.UI.danger, "Danger"),
+ new NamedColor(BTSColors.Brand.logo, "Logo"),
+ new NamedColor(BTSColors.Brand.brand_lightest, "Brand Lightest"),
+ new NamedColor(BTSColors.Brand.brand_lighter, "Brand Lighter"),
+ new NamedColor(BTSColors.Brand.brand_light, "Brand Light"),
+ new NamedColor(BTSColors.Brand.brand_medium, "Brand Medium"),
+ new NamedColor(BTSColors.Brand.brand_dark, "Brand Dark"),
+ new NamedColor(BTSColors.Brand.brand_darker, "Brand Darker"),
+ new NamedColor(BTSColors.Brand.brand_darkest, "Brand Darkest"),
}
};
diff --git a/src/client/spark/view/Controls/ColorPicker/ColorPickerControl.xaml b/src/client/spark/view/Controls/ColorPicker/ColorPickerControl.xaml
index dc6232211..4ee14fc53 100644
--- a/src/client/spark/view/Controls/ColorPicker/ColorPickerControl.xaml
+++ b/src/client/spark/view/Controls/ColorPicker/ColorPickerControl.xaml
@@ -211,15 +211,27 @@
-
+
+
-
+
+
+
-
+
+
-
+
+ Text="{Binding blue, Mode=TwoWay}" />
+
-
+
-
+
-
+
+
-
+
+
-
+
+ ShowExpanderArrow="False">
-
-
-
-
+
-
+
@@ -37,8 +33,7 @@
-
-
+
diff --git a/src/client/spark/view/Controls/ComboCheckBox/ComboCheckBox.xaml b/src/client/spark/view/Controls/ComboCheckBox/ComboCheckBox.xaml
index 690938da6..696b0e495 100644
--- a/src/client/spark/view/Controls/ComboCheckBox/ComboCheckBox.xaml
+++ b/src/client/spark/view/Controls/ComboCheckBox/ComboCheckBox.xaml
@@ -1,6 +1,8 @@
-
+
@@ -26,11 +28,10 @@
x:Name="arrow"
Grid.Column="1"
HorizontalAlignment="Right"
- Data="F1 M 0,0 L 2.667,2.66665 L 5.3334,0 L 5.3334,-1.78168 L 2.6667,0.88501 L0,-1.78168 L0,0 Z"
- Margin="0,2,4,2"
- Fill="#FF606060"
VerticalAlignment="Center"
- />
+ Margin="0,2,4,2"
+ Fill="{TemplateBinding Foreground}"
+ Data="F1 M 0,0 L 2.667,2.66665 L 5.3334,0 L 5.3334,-1.78168 L 2.6667,0.88501 L0,-1.78168 L0,0 Z" />
@@ -48,6 +49,7 @@
VerticalAlignment="{TemplateBinding VerticalAlignment}"
Padding="{TemplateBinding Padding}"
Background="Transparent"
+ Foreground="{TemplateBinding Foreground}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
@@ -60,19 +62,36 @@
ContentTemplateSelector="{Binding HeaderContentTemplateSelector, RelativeSource={RelativeSource TemplatedParent}}"
Template="{StaticResource MultiSelectToggleButton}"
/>
-
-
-
-
+
+
+
+
-
+
-
+
@@ -81,15 +100,21 @@
-
-
+
+
+
+
+
+
+
@@ -360,7 +356,12 @@
Header
-
+
Width
Horizontal Alignment
@@ -369,25 +370,17 @@
-
Override Font Color
-
-
@@ -436,24 +422,17 @@
-
Override Font Color
-
Override Background
-
Override Font Color
-
Override Background
@@ -565,12 +536,11 @@
-
Override Font Color
-
Override Background
@@ -616,12 +579,11 @@
-
Override Font Color
-
Override Background
-
@@ -854,11 +802,6 @@
/>
-
-
+
-
diff --git a/src/client/spark/view/Controls/DataGridEx/DataGridExResources.xaml b/src/client/spark/view/Controls/DataGridEx/DataGridExResources.xaml
deleted file mode 100644
index 43cfcf481..000000000
--- a/src/client/spark/view/Controls/DataGridEx/DataGridExResources.xaml
+++ /dev/null
@@ -1,177 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/client/spark/view/Controls/DataGridEx/Filters/Views/FilterContentControl.xaml b/src/client/spark/view/Controls/DataGridEx/Filters/Views/FilterContentControl.xaml
index a4b862fd5..8b3542d71 100644
--- a/src/client/spark/view/Controls/DataGridEx/Filters/Views/FilterContentControl.xaml
+++ b/src/client/spark/view/Controls/DataGridEx/Filters/Views/FilterContentControl.xaml
@@ -18,7 +18,7 @@
Grid.Row="1"
HorizontalAlignment="Stretch"
Padding="10,8"
- Background="{u:BTSBrush dialog_skirt}">
+ Background="{u:BTSBrush UI.spark_menu_background}">
diff --git a/src/client/spark/view/Shell/Settings/ShellSettingsDialog.xaml b/src/client/spark/view/Shell/Settings/ShellSettingsDialog.xaml
index 2295a9f32..12c3a1409 100644
--- a/src/client/spark/view/Shell/Settings/ShellSettingsDialog.xaml
+++ b/src/client/spark/view/Shell/Settings/ShellSettingsDialog.xaml
@@ -36,6 +36,7 @@