From c9e3cf8c67fac192b86c95f3ef2da8f144e31367 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 29 Jul 2026 11:29:24 -0400 Subject: [PATCH] Rename AuxiliaryDataResources -> OrderAuxiliaryPopupResources The old name was unnecessarily vague --- .../Modules/Market/MarketView/MarketViewView.xaml.cs | 12 ++++++------ .../spark/Modules/Trading/PNL/View/PNLView.xaml.cs | 6 +++--- .../OrderAuxiliaryPopupResources.xaml} | 4 ++-- .../OrderAuxiliaryPopupResources.xaml.cs} | 6 +++--- 4 files changed, 14 insertions(+), 14 deletions(-) rename src/client/spark/view/Controls/{Popup/AuxiliaryDataView.xaml => Order/OrderAuxiliaryPopupResources.xaml} (98%) rename src/client/spark/view/Controls/{Popup/AuxiliaryDataView.xaml.cs => Order/OrderAuxiliaryPopupResources.xaml.cs} (84%) diff --git a/src/client/spark/Modules/Market/MarketView/MarketViewView.xaml.cs b/src/client/spark/Modules/Market/MarketView/MarketViewView.xaml.cs index 783f4005d..b4391a949 100644 --- a/src/client/spark/Modules/Market/MarketView/MarketViewView.xaml.cs +++ b/src/client/spark/Modules/Market/MarketView/MarketViewView.xaml.cs @@ -92,7 +92,7 @@ namespace mbts.ui.spark { void _show_mini_orderbook(IReadOnlyList securities, Columns col) { var (vm, context, title, fg) = _vm.orderbook_params(securities, col); - _show_popup(vm, new AuxiliaryDataHeader { + _show_popup(vm, new OrderAuxiliaryPopupHeader { context = context, title = title, title_foreground = fg @@ -104,7 +104,7 @@ namespace mbts.ui.spark { void _show_mini_fills(IEnumerable securities, Columns col) { var (vm, context, title, fg) = _vm.fills_params(securities, col); - _show_popup(vm, new AuxiliaryDataHeader { + _show_popup(vm, new OrderAuxiliaryPopupHeader { context = context, title = title, title_foreground = fg @@ -114,7 +114,7 @@ namespace mbts.ui.spark { async void _show_order_ticket( SecurityMD security_md, double price = double.NaN, double size = 0) { var resources = new OrderTicketResources(); - resources.MergedDictionaries.Add(new AuxiliaryDataResources()); + resources.MergedDictionaries.Add(new OrderAuxiliaryPopupResources()); var account = await _vm.get_default_account(security_md.security); var def = _model.factory.order(security_md.security, account); @@ -136,7 +136,7 @@ namespace mbts.ui.spark { } void _show_popup(object content, object header) { - var resources = new AuxiliaryDataResources(); + var resources = new OrderAuxiliaryPopupResources(); resources.MergedDictionaries.Add(new AutoHideScrollbarResources()); _show_popup(content, header, resources); } @@ -148,9 +148,9 @@ namespace mbts.ui.spark { Header = header, HorizontalAlignment = HorizontalAlignment.Left, VerticalAlignment = VerticalAlignment.Top, - Resources = resources ?? new AuxiliaryDataResources() + Resources = resources ?? new OrderAuxiliaryPopupResources() }; - view.Style = view.Resources[AuxiliaryDataResources.PopupChildStyleKey] as Style; + view.Style = view.Resources[OrderAuxiliaryPopupResources.PopupChildStyleKey] as Style; init_view?.Invoke(view); _popup_man.show(view); } diff --git a/src/client/spark/Modules/Trading/PNL/View/PNLView.xaml.cs b/src/client/spark/Modules/Trading/PNL/View/PNLView.xaml.cs index b79917782..fa3190ee4 100644 --- a/src/client/spark/Modules/Trading/PNL/View/PNLView.xaml.cs +++ b/src/client/spark/Modules/Trading/PNL/View/PNLView.xaml.cs @@ -407,16 +407,16 @@ namespace bts.shell.pnl { void _show_auxiliary_popup(T content, string context_desc, string title_desc, Color fg) { var view = new HeaderedContentControl { Content = content, - Header = new AuxiliaryDataHeader { + Header = new OrderAuxiliaryPopupHeader { context = context_desc, title = title_desc, title_foreground = fg }, HorizontalAlignment = HorizontalAlignment.Left, VerticalAlignment = VerticalAlignment.Top, - Resources = new AuxiliaryDataResources() + Resources = new OrderAuxiliaryPopupResources() }; - view.Style = view.Resources[AuxiliaryDataResources.PopupChildStyleKey] as Style; + view.Style = view.Resources[OrderAuxiliaryPopupResources.PopupChildStyleKey] as Style; _popup_man.show(view); } diff --git a/src/client/spark/view/Controls/Popup/AuxiliaryDataView.xaml b/src/client/spark/view/Controls/Order/OrderAuxiliaryPopupResources.xaml similarity index 98% rename from src/client/spark/view/Controls/Popup/AuxiliaryDataView.xaml rename to src/client/spark/view/Controls/Order/OrderAuxiliaryPopupResources.xaml index cd44d1155..549a79539 100644 --- a/src/client/spark/view/Controls/Popup/AuxiliaryDataView.xaml +++ b/src/client/spark/view/Controls/Order/OrderAuxiliaryPopupResources.xaml @@ -1,5 +1,5 @@  - + diff --git a/src/client/spark/view/Controls/Popup/AuxiliaryDataView.xaml.cs b/src/client/spark/view/Controls/Order/OrderAuxiliaryPopupResources.xaml.cs similarity index 84% rename from src/client/spark/view/Controls/Popup/AuxiliaryDataView.xaml.cs rename to src/client/spark/view/Controls/Order/OrderAuxiliaryPopupResources.xaml.cs index 5b5ed8f91..6a58f5b68 100644 --- a/src/client/spark/view/Controls/Popup/AuxiliaryDataView.xaml.cs +++ b/src/client/spark/view/Controls/Order/OrderAuxiliaryPopupResources.xaml.cs @@ -4,14 +4,14 @@ using System.Windows; using System.Windows.Media; namespace mbts.ui.spark { - partial class AuxiliaryDataResources : ResourceDictionary { - public AuxiliaryDataResources() => + partial class OrderAuxiliaryPopupResources : ResourceDictionary { + public OrderAuxiliaryPopupResources() => InitializeComponent(); public static string PopupChildStyleKey => nameof(PopupChildStyleKey); } - class AuxiliaryDataHeader : ViewModelBase { + class OrderAuxiliaryPopupHeader : ViewModelBase { string _title, _context;