diff --git a/src/client/spark/Modules/Market/MarketView/MarketViewWindow.cs b/src/client/spark/Modules/Market/MarketView/MarketViewWindow.cs index 4f8ed89b2..a9652edcf 100644 --- a/src/client/spark/Modules/Market/MarketView/MarketViewWindow.cs +++ b/src/client/spark/Modules/Market/MarketView/MarketViewWindow.cs @@ -144,7 +144,7 @@ namespace mbts.spark { SparkCommands.change_securities_command(() => (update_securities_cmd, _state.security_criteria)), // wrap the grid settings view factory in a dialogCommand here since the vm is destroyed/recreated when the security criteria changes SparkCommands.window_settings_command(new DialogCommand(() => { - var vm = new WindowSettingsDialogVM( + var vm = new ShellSettingsDialogVM( _settings_manager, us => us.market_view_grid, UserSettings.FileExtensions.GRID, diff --git a/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesWindow.cs b/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesWindow.cs index 297d874e7..8ab059534 100644 --- a/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesWindow.cs +++ b/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesWindow.cs @@ -70,7 +70,7 @@ namespace mbts.spark { SparkCommands.change_securities_command(() => (update_securities_cmd, _state.security_criteria)), // wrap the grid settings view factory in a dialogCommand here since the vm is destroyed/recreated when the security criteria changes SparkCommands.window_settings_command(new DialogCommand(() => { - var vm = new WindowSettingsDialogVM( + var vm = new ShellSettingsDialogVM( _settings_manager, s => s.time_and_sales_grid, UserSettings.FileExtensions.GRID, diff --git a/src/client/spark/Modules/Spreader/SyntheticManagementWindow.cs b/src/client/spark/Modules/Spreader/SyntheticManagementWindow.cs index be568334e..6cfa693d2 100644 --- a/src/client/spark/Modules/Spreader/SyntheticManagementWindow.cs +++ b/src/client/spark/Modules/Spreader/SyntheticManagementWindow.cs @@ -75,7 +75,7 @@ namespace mbts.spark { }; return ob_settings; }), SparkCommands.window_settings_command(new DialogCommand(() => { - var vm = new WindowSettingsDialogVM( + var vm = new ShellSettingsDialogVM( _settings_manager, us => us.synthetic_management_grid, UserSettings.FileExtensions.GRID, diff --git a/src/client/spark/Modules/Trading/Fills/FillsWindow.cs b/src/client/spark/Modules/Trading/Fills/FillsWindow.cs index 79e745e26..20c36e90d 100644 --- a/src/client/spark/Modules/Trading/Fills/FillsWindow.cs +++ b/src/client/spark/Modules/Trading/Fills/FillsWindow.cs @@ -60,7 +60,7 @@ namespace mbts.spark { _commands = new List { // wrap the grid settings view factory in a dialogCommand here since the vm is destroyed/recreated when the security criteria changes SparkCommands.window_settings_command(new DialogCommand(() => { - var vm = new WindowSettingsDialogVM( + var vm = new ShellSettingsDialogVM( _settings_manager, us => us.fills_grid, UserSettings.FileExtensions.GRID, diff --git a/src/client/spark/Modules/Trading/Ladder/VM/LadderVM.cs b/src/client/spark/Modules/Trading/Ladder/VM/LadderVM.cs index c5874acef..351615776 100644 --- a/src/client/spark/Modules/Trading/Ladder/VM/LadderVM.cs +++ b/src/client/spark/Modules/Trading/Ladder/VM/LadderVM.cs @@ -129,7 +129,7 @@ namespace mbts.spark { show_book_command = new DelegateCommand(_show_book); show_ticket_command = new DelegateCommand(_show_ticket); settings_command = new DialogCommand(() => { - var vm = new WindowSettingsDialogVM( + var vm = new ShellSettingsDialogVM( settings_manager, s => s.ladder, UserSettings.FileExtensions.LADDER, s => { var svm = new LadderSettingsVM(model.order_gateway, security.ContractCase == Security.ContractOneofCase.Synthetic, () => left_panel_width, () => zoom_factor); diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs index b9a1f3386..53d35ecbb 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs @@ -125,7 +125,7 @@ namespace mbts.spark { toggle_show_fills_cmd = new DelegateCommand(() => show_fills = !show_fills); launch_fills_settings_cmd = concated_disposable(new DialogCommand(() => { const string title = "Order Book 'Mini' Fills Grid"; - var vm = new WindowSettingsDialogVM( + var vm = new ShellSettingsDialogVM( _fills_settings_manager, us => us.fills_grid, UserSettings.FileExtensions.GRID, diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookWindow.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookWindow.cs index 9d718ff15..fa89ed3de 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookWindow.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookWindow.cs @@ -161,7 +161,7 @@ namespace mbts.spark { toggle_expand_all_command.group = CommandGroups.Auxiliary; var show_grid_settings_command = SparkCommands.window_settings_command(new DialogCommand(() => { - var gs_vm = new WindowSettingsDialogVM( + var gs_vm = new ShellSettingsDialogVM( _settings_manager, us => us.order_book_grid, UserSettings.FileExtensions.GRID, diff --git a/src/client/spark/view/Spark/Utilities/WindowSettingsDialogVM.cs b/src/client/spark/view/Shell/Settings/ShellSettingsDialogVM.cs similarity index 89% rename from src/client/spark/view/Spark/Utilities/WindowSettingsDialogVM.cs rename to src/client/spark/view/Shell/Settings/ShellSettingsDialogVM.cs index 4340f2724..90649db2a 100644 --- a/src/client/spark/view/Spark/Utilities/WindowSettingsDialogVM.cs +++ b/src/client/spark/view/Shell/Settings/ShellSettingsDialogVM.cs @@ -11,13 +11,13 @@ namespace mbts.spark { T get_result(); } - class WindowSettingsDialogVM : ViewModelBase, IRequestViewClose, IDisposable where T : class, IEquatable where TVM : IWindowSettingsVM { + class ShellSettingsDialogVM : ViewModelBase, IRequestViewClose, IDisposable where T : class, IEquatable where TVM : IWindowSettingsVM { readonly Property _use_default; readonly DialogSkirtItem _ok_item, _apply_item, _cancel_item, _apply_to_defaults_item; readonly DelegateProperty> _left_skirt_items; readonly List _resources = new List(2); // initialize with 2 capacity bc the only potential disposables are the instance/default vms - public WindowSettingsDialogVM(IWindowSettingsManager settings_manager, Func get_factory_settings, string settings_file_ext, Func vm_factory, Func merge_with_current = null, bool show_save_as_defaults = true) { + public ShellSettingsDialogVM(IWindowSettingsManager settings_manager, Func get_factory_settings, string settings_file_ext, Func vm_factory, Func merge_with_current = null, bool show_save_as_defaults = true) { if (merge_with_current == null) merge_with_current = s => s; // by default, each new window will use their own instance settings diff --git a/src/client/spark/view/Spark/PAndL/PAndLWindow.cs b/src/client/spark/view/Spark/PAndL/PAndLWindow.cs index 28e6466d8..4efa927b1 100644 --- a/src/client/spark/view/Spark/PAndL/PAndLWindow.cs +++ b/src/client/spark/view/Spark/PAndL/PAndLWindow.cs @@ -57,7 +57,7 @@ namespace mbts.spark { _view.DataContext = _vm; _commands = new List { SparkCommands.window_settings_command(new DialogCommand(() => { - var vm = new WindowSettingsDialogVM( + var vm = new ShellSettingsDialogVM( _settings_manager, us => us.pnl_grid, UserSettings.FileExtensions.GRID,