functionality matches the spec; I still need to clean up some things

This commit is contained in:
Jake Norbut committed 2018-09-26 12:33:08 -05:00
1 parent 0ff7adf73b
commit 281b4e10b0
8 files changed
+48 -27

No files matched your search

@@ -106,7 +106,7 @@ namespace mbts.spark {
};
grid_settings_manager = new SimpleGridSettingsManager<Row>(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 => {
@@ -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<GridSettings, SimpleGridSettingsVM>(
_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);
@@ -37,7 +37,7 @@ namespace bts.shell {
IShellWindow _create(StartupData state) {
var settings_manager = new WindowSettingsManager<GridSettings>(_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<SortingCriteria> sorting_criterion => _sorting_criteria ?? (_sorting_criteria = new List<SortingCriteria>());
public static StartupData Default(SecurityCriteria security_criteria) =>
new StartupData(security_criteria, new FilterStates(), DefaultGridSettings);
new StartupData(security_criteria, new FilterStates(), null);
static class DefaultColumns {
@@ -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<GridSettings, SimpleGridSettingsVM>(
_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);
@@ -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
};
@@ -73,6 +73,7 @@
<RowDefinition Height="Auto"/>
<RowDefinition/>
</Grid.RowDefinitions>
<!--
<Grid Margin="0,6,0,0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="10"/>
@@ -95,7 +96,9 @@
<Rectangle Fill="{StaticResource ComboBox.Static.Border}" HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Height="1"/>
<Rectangle Grid.Column="2" Grid.ColumnSpan="2" Fill="{StaticResource ComboBox.Static.Border}" HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Height="1"/>
</Grid>
-->
<c:ActionMenu HorizontalAlignment="Right" ItemsSource="{Binding action_menu_items}"/>
<!--
<usp:GridSettingsView
Grid.Row="2"
Margin="8"
@@ -103,11 +106,11 @@
Visibility="{Binding DataContext.default_tab_selected, RelativeSource={RelativeSource AncestorType=usp:SimpleGridSettingsDialog}, Converter={StaticResource DefaultTabVisibilityConverter}}"
VerticalAlignment="Top"
/>
-->
<usp:GridSettingsView
Grid.Row="2"
Margin="8"
DataContext="{Binding instance_vm}"
Visibility="{Binding DataContext.default_tab_selected, RelativeSource={RelativeSource AncestorType=usp:SimpleGridSettingsDialog}, Converter={StaticResource CustomTabVisibilityConverter}}"
VerticalAlignment="Top"
/>
<c:DialogSkirt
@@ -51,6 +51,8 @@ namespace mbts.ui {
try {
using (var stream = File.Open(file, FileMode.Open, FileAccess.Read))
on_import(ProtoBufSerializationHelper.deserialize<TProto>(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);
}
@@ -12,16 +12,18 @@ namespace mbts.spark {
}
class WindowSettingsDialogVM<T, TVM> : ViewModelBase, IRequestViewClose where T : class, IEquatable<T> where TVM : IWindowSettingsVM<T> {
readonly Property<bool> _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<bool> /*_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<IEnumerable<DialogSkirtItem>> _left_skirt_items;
public WindowSettingsDialogVM(IWindowSettingsManager<T> settings_manager, Func<UserSettings, T> get_factory_settings, string settings_file_ext, Func<TVM> 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<T>(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<T>(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<DialogSkirtItem> 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;
*/
}
}
}