From 5fd3d13cfec6bcca2222e251c3dfe720f0863b85 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 5 Feb 2020 15:10:18 -0600 Subject: [PATCH] add spark menu dock/hide commands to synthetic management --- .../Spreader/SyntheticManagementWindow.cs | 12 ++++++++++-- .../Spreader/SyntheticManagementWindowFactory.cs | 16 +++++++++++++++- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/src/client/spark/Modules/Spreader/SyntheticManagementWindow.cs b/src/client/spark/Modules/Spreader/SyntheticManagementWindow.cs index e7b449de9..40c515b61 100644 --- a/src/client/spark/Modules/Spreader/SyntheticManagementWindow.cs +++ b/src/client/spark/Modules/Spreader/SyntheticManagementWindow.cs @@ -3,6 +3,7 @@ using bts.api; using bts.shell; using bts.shell.spreader; using bts.spark; +using bts.view; using mbts.persist; using mbts.ui; using mbts.ui.settings; @@ -27,6 +28,7 @@ namespace mbts.spark { StartupData _state; OrdersModel _orders_model; SyntheticManagementView _view; + SparkMenuDisplayVM _menu_display_vm; IDisposable _subscriptions; IReadOnlyList _commands; readonly IWindowSettingsManager _settings_manager; @@ -43,7 +45,7 @@ namespace mbts.spark { public override string window_type => _window_type; public override UIElement Content => _view; public override IEnumerable Commands => _commands; - public override StartupData SaveState => _state = _vm.value.create(); + public override StartupData SaveState => _state = _vm.value.create().with(menu_display: _menu_display_vm.safe_create()); public override double MinWidth => StartupData.DefaultGridSettings.columns.Sum(gcs => gcs.width) + SPARK_MENU_COLLAPSED_WIDTH @@ -53,6 +55,8 @@ namespace mbts.spark { public void thread_init() { Log.notnull(_state); + _menu_display_vm = new SparkMenuDisplayVM(); + _menu_display_vm.load_from(_state.menu_display); var vm_connectable_builder = new ConnectableSeriesBuilder(_vm.observable); var current_row_source = vm_connectable_builder.create(vm => vm.current_row_observable); @@ -97,7 +101,8 @@ namespace mbts.spark { new SparkCommandCommand( "Import Synthetics...", Icons.Import, FileDialogCommand.open_file(import, extensions: SyntheticSecurityParser.file_extension)) { show_in_toolbar = false - } + }, + _menu_display_vm.spark_cmd }; _subscriptions = Disposable.Create( @@ -129,6 +134,9 @@ namespace mbts.spark { Commands.OfType().DisposeAll(); } + protected override void OnParentViewCreated(SparkWindowView parent_view) => + _menu_display_vm.safe_bind_to_view(parent_view); + struct RowModificationParams { public readonly SecurityImmutable security; public readonly bool has_working_orders; diff --git a/src/client/spark/Modules/Spreader/SyntheticManagementWindowFactory.cs b/src/client/spark/Modules/Spreader/SyntheticManagementWindowFactory.cs index 29125b873..a853bc73f 100644 --- a/src/client/spark/Modules/Spreader/SyntheticManagementWindowFactory.cs +++ b/src/client/spark/Modules/Spreader/SyntheticManagementWindowFactory.cs @@ -48,14 +48,28 @@ namespace bts.shell { public readonly FilterStates filters; [ProtoMember(3)] public readonly GridSettings grid; + [ProtoMember(4)] + public readonly SparkMenuDisplaySettings menu_display; public StartupData() : this(new List(), null, null) { } - public StartupData(List sorting_criteria, FilterStates filters, GridSettings grid = default) { + + public StartupData(List sorting_criteria, FilterStates filters, GridSettings grid = default) + : this(sorting_criteria, filters, grid, SparkMenuDisplaySettings.Default) { } + + public StartupData(List sorting_criteria, FilterStates filters, GridSettings grid, SparkMenuDisplaySettings menu_display) { this.sorting_criteria = sorting_criteria; this.filters = filters; this.grid = grid; + this.menu_display = menu_display; } + public StartupData with(List sorting_criteria = null, FilterStates filters = null, GridSettings grid = null, SparkMenuDisplaySettings? menu_display = null) => + new StartupData( + sorting_criteria ?? this.sorting_criteria, + filters ?? this.filters, + grid ?? this.grid, + menu_display ?? this.menu_display); + public static GridSettings DefaultGridSettings => GridSettings.Default.with(DefaultColumns.all, DefaultColumns.default_sorting_criterion); static class DefaultColumns {