diff --git a/src/client/spark/Modules/Market/MarketView/MarketViewVM.cs b/src/client/spark/Modules/Market/MarketView/MarketViewVM.cs index bc7e580b2..a8adfe848 100644 --- a/src/client/spark/Modules/Market/MarketView/MarketViewVM.cs +++ b/src/client/spark/Modules/Market/MarketView/MarketViewVM.cs @@ -106,7 +106,7 @@ namespace mbts.spark { }; grid_settings_manager = new SimpleGridSettingsManager(columns, col_settings_flags, row_vms); // this will initialize the immutable properties that correspond to the col_settings_flags above (e.g. Bid/Ask font_color_override, etc.) - grid_settings_manager.load_from(UserSettings.factory_defaults.market_view_grid_defaults); + grid_settings_manager.load_from(settings_manager.current_settings()); // _resources.AddRange( state.OnDispatcher().Subscribe(s => { diff --git a/src/client/spark/Modules/Market/MarketView/MarketViewWindow.cs b/src/client/spark/Modules/Market/MarketView/MarketViewWindow.cs index 404b6a696..18630e795 100644 --- a/src/client/spark/Modules/Market/MarketView/MarketViewWindow.cs +++ b/src/client/spark/Modules/Market/MarketView/MarketViewWindow.cs @@ -66,7 +66,7 @@ namespace mbts.spark { // 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( - _settings_manager, s => s.market_view_grid_defaults, UserSettings.FileExtensions.GRID, () => new SimpleGridSettingsVM(this.observe_title())); + _settings_manager, s => s.market_view_grid, UserSettings.FileExtensions.GRID, () => new SimpleGridSettingsVM(this.observe_title())); // TODO: bind to main window's Title var dialog = new SimpleGridSettingsDialog { Title = "Market View Grid Settings", DataContext = vm }; vm.RequestClose += (s, e) => WindowUtilities.force_close(dialog); diff --git a/src/client/spark/Modules/Market/MarketView/MarketViewWindowFactory.cs b/src/client/spark/Modules/Market/MarketView/MarketViewWindowFactory.cs index 5c6a194e8..244ebf3a6 100644 --- a/src/client/spark/Modules/Market/MarketView/MarketViewWindowFactory.cs +++ b/src/client/spark/Modules/Market/MarketView/MarketViewWindowFactory.cs @@ -37,7 +37,7 @@ namespace bts.shell { IShellWindow _create(StartupData state) { var settings_manager = new WindowSettingsManager(_settings_hub, state.grid, - get: us => us.market_view_grid_defaults, + get: us => us.market_view_grid, set: (us, gs) => us.with(provided_market_view_gridsettings: gs)); return new MarketViewWindow(this, _bus, _orders_model, state, settings_manager); } @@ -72,7 +72,7 @@ namespace bts.shell { public IReadOnlyList sorting_criterion => _sorting_criteria ?? (_sorting_criteria = new List()); public static StartupData Default(SecurityCriteria security_criteria) => - new StartupData(security_criteria, new FilterStates(), DefaultGridSettings); + new StartupData(security_criteria, new FilterStates(), null); static class DefaultColumns { diff --git a/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesWindow.cs b/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesWindow.cs index e2d2330ac..b5064a3ef 100644 --- a/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesWindow.cs +++ b/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesWindow.cs @@ -75,7 +75,7 @@ namespace mbts.spark { // 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( - _settings_manager, s => s.market_view_grid_defaults, UserSettings.FileExtensions.GRID, () => new SimpleGridSettingsVM(this.observe_title())); + _settings_manager, s => s.market_view_grid, UserSettings.FileExtensions.GRID, () => new SimpleGridSettingsVM(this.observe_title())); // TODO: bind to main window's Title var dialog = new SimpleGridSettingsDialog { Title = "Time and Sales Grid Settings", DataContext = vm }; vm.RequestClose += (s, e) => WindowUtilities.force_close(dialog); diff --git a/src/client/spark/core/ShellInterface/UserSettings/UserSettings.cs b/src/client/spark/core/ShellInterface/UserSettings/UserSettings.cs index 9eb9b9e5a..f0eda3dbf 100644 --- a/src/client/spark/core/ShellInterface/UserSettings/UserSettings.cs +++ b/src/client/spark/core/ShellInterface/UserSettings/UserSettings.cs @@ -14,7 +14,7 @@ namespace mbts.spark { new UserSettings { _ladder = LadderSettings.Default, _notification = NotificationSettings.Default, - _market_view_grid_defaults = bts.shell.MarketViewWindowFactory.StartupData.DefaultGridSettings + _market_view_grid = bts.shell.MarketViewWindowFactory.StartupData.DefaultGridSettings }; [ProtoMember(1)] @@ -24,7 +24,7 @@ namespace mbts.spark { NotificationSettings _notification; [ProtoMember(5)] - GridSettings _market_view_grid_defaults; + GridSettings _market_view_grid; [ProtoMember(6)] GridSettings _time_and_sales; @@ -32,14 +32,14 @@ namespace mbts.spark { public LadderSettings ladder => _ladder ?? (_ladder = LadderSettings.Default); public NotificationSettings notification => _notification ?? (_notification = NotificationSettings.Default); - public GridSettings market_view_grid_defaults => _market_view_grid_defaults ?? (_market_view_grid_defaults = bts.shell.MarketViewWindowFactory.StartupData.DefaultGridSettings); + public GridSettings market_view_grid => _market_view_grid ?? (_market_view_grid = bts.shell.MarketViewWindowFactory.StartupData.DefaultGridSettings); public GridSettings time_and_sales => _time_and_sales ?? (_time_and_sales = GridSettings.Default.with(bts.shell.TimeAndSalesWindowFactory.StartupData.DefaultColumns.all)); public UserSettings with(LadderSettings ladder = null, NotificationSettings notification = null, GridSettings provided_market_view_gridsettings = null, GridSettings time_and_sales = null) => new UserSettings { _ladder = ladder ?? _ladder, _notification = notification ?? _notification, - _market_view_grid_defaults = provided_market_view_gridsettings ?? _market_view_grid_defaults, + _market_view_grid = provided_market_view_gridsettings ?? _market_view_grid, _time_and_sales = time_and_sales ?? _time_and_sales }; diff --git a/src/client/spark/view/Controls/DIYGrid/Settings/SimpleGridSettingsDialog.xaml b/src/client/spark/view/Controls/DIYGrid/Settings/SimpleGridSettingsDialog.xaml index 90467ae8c..0c8a224a3 100644 --- a/src/client/spark/view/Controls/DIYGrid/Settings/SimpleGridSettingsDialog.xaml +++ b/src/client/spark/view/Controls/DIYGrid/Settings/SimpleGridSettingsDialog.xaml @@ -73,6 +73,7 @@ + + (stream)); + } catch (ProtoBuf.ProtoException e) when (e.Message.StartsWith("Invalid wire-type;")) { + BTSMessageBox.Show("This doesn't appear to be the correct settings file for this window.\r\n\r\nPlease try importing a different settings file.", error_msg_title ?? "Import", BTSMessageBoxButtons.OK, System.Windows.MessageBoxImage.Hand, true, false, true); } catch (Exception ex) { BTSMessageBox.Show($"Error importing {type_name ?? "item"} at '{file}': {ex}.", error_msg_title ?? "Import", BTSMessageBoxButtons.OK, System.Windows.MessageBoxImage.Error, true, false, true); } diff --git a/src/client/spark/view/Spark/Utilities/WindowSettingsDialogVM.cs b/src/client/spark/view/Spark/Utilities/WindowSettingsDialogVM.cs index 4e8d388ea..7475211ab 100644 --- a/src/client/spark/view/Spark/Utilities/WindowSettingsDialogVM.cs +++ b/src/client/spark/view/Spark/Utilities/WindowSettingsDialogVM.cs @@ -12,16 +12,18 @@ namespace mbts.spark { } class WindowSettingsDialogVM : ViewModelBase, IRequestViewClose where T : class, IEquatable where TVM : IWindowSettingsVM { - readonly Property _default_tab_selected, _use_default; - readonly DialogSkirtItem _sync_to_factory_item, _sync_to_default_item, _sync_to_instance_item, _ok_item, _apply_item, _cancel_item; + readonly Property /*_default_tab_selected,*/ _use_default; + readonly DialogSkirtItem _sync_to_factory_item, _sync_to_default_item, _sync_to_instance_item, _ok_item, _apply_item, _cancel_item, _apply_to_defaults_item; readonly DelegateProperty> _left_skirt_items; public WindowSettingsDialogVM(IWindowSettingsManager settings_manager, Func get_factory_settings, string settings_file_ext, Func vm_factory) { - var settings = settings_manager.current_settings(); - _default_tab_selected = backing(nameof(default_tab_selected), settings_manager.instance_settings == null); - _use_default = backing(nameof(use_default), default_tab_selected); + //var settings = settings_manager.current_settings(); + //_default_tab_selected = backing(nameof(default_tab_selected), settings_manager.instance_settings == null); + // by default, each new window will use their own instance settings + _use_default = backing(nameof(use_default), settings_manager.instance_settings == null); default_vm = vm_factory(); default_vm.load(settings_manager.default_settings); + // instance vm is what will always be visible on the screen instance_vm = vm_factory(); instance_vm.load(settings_manager.current_settings()); // items @@ -34,15 +36,15 @@ namespace mbts.spark { export_to_custom_cmd.RaiseCanExecuteChanged(); }; action_menu_items = new IMenuItemVM[] { - new MenuItemVM("Import File to Default...", FileDialogCommand.import_proto(s => default_vm.load(s), null, settings_file_ext), Icons.Import, import_group), - new MenuItemVM("Import File to Custom...", import_to_custom_cmd, Icons.Import, import_group), - new MenuItemVM("Export Default to File...", FileDialogCommand.export_proto(() => default_vm.get_result(), filter_items: file_filter), Icons.Export, export_group), - new MenuItemVM("Export Custom to File...", export_to_custom_cmd, Icons.Export, export_group) + /*new MenuItemVM("Import File to Default...", FileDialogCommand.import_proto(s => default_vm.load(s), null, settings_file_ext), Icons.Import, import_group),*/ + new MenuItemVM("Import Settings File ...", import_to_custom_cmd, Icons.Import, import_group), + /*new MenuItemVM("Export Default to File...", FileDialogCommand.export_proto(() => default_vm.get_result(), filter_items: file_filter), Icons.Export, export_group),*/ + new MenuItemVM("Export Settings File...", export_to_custom_cmd, Icons.Export, export_group) }; - _left_skirt_items = backing(nameof(left_skirt_items), left_skirt_factory, nameof(default_tab_selected)); + _left_skirt_items = backing(nameof(left_skirt_items), left_skirt_factory); _sync_to_factory_item = new DialogSkirtItem( "Reset to Factory", - new DelegateCommand(() => (default_tab_selected ? default_vm : instance_vm).load(get_factory_settings(UserSettings.factory_defaults))), + new DelegateCommand(() => instance_vm.load(get_factory_settings(UserSettings.factory_defaults))), ui.spark.LadderSettingsDialog.ResetToFactoryKey); _sync_to_default_item = new DialogSkirtItem( "Copy from Default", @@ -54,23 +56,35 @@ namespace mbts.spark { ui.spark.LadderSettingsDialog.CopyFromOtherKey); _apply_item = new DialogSkirtItem("Apply", new DelegateCommand(apply)); _ok_item = new DialogSkirtItem("OK", new DelegateCommand(() => { + use_default = false; apply(); close(); })) { is_default = true }; _cancel_item = new DialogSkirtItem("Cancel", new DelegateCommand(close)) { is_cancel = true }; + _apply_to_defaults_item = new DialogSkirtItem("Save As Defaults", new DelegateCommand(() => { + use_default = true; + apply(); + close(); + }), ui.spark.LadderSettingsDialog.ResetToFactoryKey); // local methods void apply() { - var my_default = default_vm.get_result(); - if (!my_default.safe_equals(settings_manager.default_settings)) - settings_manager.save_default_settings(my_default).ignore(); if (!use_default) { settings_manager.instance_settings = instance_vm.get_result(); - } else settings_manager.instance_settings = null; + } else { + settings_manager.instance_settings = null; + + var my_default = instance_vm.get_result();// default_vm.get_result(); + if (!my_default.safe_equals(settings_manager.default_settings)) + settings_manager.save_default_settings(my_default).ignore(); + + } + } void close() => RequestClose?.Invoke(this, new EventArgs()); IEnumerable left_skirt_factory() { yield return _sync_to_factory_item; - yield return default_tab_selected ? _sync_to_instance_item : _sync_to_default_item; + yield return _apply_to_defaults_item; + //yield return default_tab_selected ? _sync_to_instance_item : _sync_to_default_item; }; } @@ -87,13 +101,15 @@ namespace mbts.spark { yield return _cancel_item; } } - public bool default_tab_selected { get => _default_tab_selected.Value; set => _default_tab_selected.Value = value; } + //public bool default_tab_selected { get => _default_tab_selected.Value; set => _default_tab_selected.Value = value; } public bool use_default { get => _use_default.Value; set { _use_default.Value = value; + /* if (value) default_tab_selected = true; + */ } } }