SPARK-1652 unify settings icons across all forms
This commit is contained in:
1 parent
8e00da5a72
commit
55cb3592a1
9 files changed
+91
-125
No files matched your search
@@ -1,17 +1,12 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using bts.api;
|
||||
using bts.api;
|
||||
using bts.spark;
|
||||
using mbts;
|
||||
using mbts.spark;
|
||||
using mbts.ui;
|
||||
using System;
|
||||
using System.ComponentModel.Composition;
|
||||
using mbts;
|
||||
using System.Windows;
|
||||
using System.Windows.Input;
|
||||
using bts.spark;
|
||||
using System.Reactive.Linq;
|
||||
using System.Windows;
|
||||
|
||||
namespace bts {
|
||||
[Export, Export(typeof(IShellDaemon))]
|
||||
@@ -29,102 +24,57 @@ namespace bts {
|
||||
bus.subscribe(SparkTags.ShowAndEditPickMultiple).OnDispatcher().Subscribe(show_and_edit_pick_multiple)
|
||||
);
|
||||
}
|
||||
|
||||
void show_pick_one(PartialCommand<SecurityMD> message) {
|
||||
var vm = new ContractPickerModel(_bus, false, null);
|
||||
var view = new ContractPickerView(vm);
|
||||
|
||||
Window picker = new Window {
|
||||
Content = view,
|
||||
Title = $"Select a Security for {message.title}",
|
||||
Icon = message.icon,
|
||||
Height = view.Height,
|
||||
Width = view.Width
|
||||
};
|
||||
picker.Style = picker.TryFindResource("BTSWindow") as Style;
|
||||
view.Height = Double.NaN;
|
||||
view.Width = Double.NaN;
|
||||
|
||||
vm.ok_action = () => {
|
||||
picker.Close();
|
||||
message.complete(vm.result).execute(_bus);
|
||||
};
|
||||
picker.move_to_mouse();
|
||||
picker.Show();
|
||||
}
|
||||
|
||||
void show_filtered_pick_one((PartialCommand<SecurityMD> message, SecurityCriteria global_filter) message_and_filter) {
|
||||
var vm = new ContractPickerModel(_bus, false, null, message_and_filter.global_filter);
|
||||
var view = new ContractPickerView(vm);
|
||||
|
||||
Window picker = new Window {
|
||||
Content = view,
|
||||
Title = $"Select a Security for {message_and_filter.message.title}",
|
||||
Icon = message_and_filter.message.icon,
|
||||
Height = view.Height,
|
||||
Width = view.Width
|
||||
};
|
||||
picker.Style = picker.TryFindResource("BTSWindow") as Style;
|
||||
view.Height = Double.NaN;
|
||||
view.Width = Double.NaN;
|
||||
|
||||
vm.ok_action = () => {
|
||||
picker.Close();
|
||||
message_and_filter.message.complete(vm.result).execute(_bus);
|
||||
};
|
||||
picker.move_to_mouse();
|
||||
picker.Show();
|
||||
}
|
||||
|
||||
void show_pick_multiple(PartialCommand<SecurityCriteria> message) {
|
||||
var vm = new ContractPickerModel(_bus, true, null);
|
||||
var view = new ContractPickerView(vm);
|
||||
|
||||
Window picker = new Window
|
||||
{
|
||||
Content = view,
|
||||
Title = $"Select Securities for {message.title}",
|
||||
Icon = message.icon,
|
||||
Height = view.Height,
|
||||
Width = view.Width,
|
||||
};
|
||||
picker.Style = picker.TryFindResource("BTSWindow") as Style;
|
||||
view.Height = Double.NaN;
|
||||
view.Width = Double.NaN;
|
||||
|
||||
vm.ok_action = () => {
|
||||
picker.Close();
|
||||
message.complete(vm.result_criteria).execute(_bus);
|
||||
};
|
||||
picker.move_to_mouse();
|
||||
picker.Show();
|
||||
}
|
||||
|
||||
void show_and_edit_pick_multiple((PartialCommand<SecurityCriteria> message, SecurityCriteria existing_criteria) message_and_data) {
|
||||
var vm = new ContractPickerModel(_bus, true, message_and_data.existing_criteria);
|
||||
var view = new ContractPickerView(vm);
|
||||
|
||||
Window picker = new Window {
|
||||
Content = view,
|
||||
Title = $" {message_and_data.message.title} security selection",
|
||||
Icon = message_and_data.message.icon,
|
||||
Height = view.Height,
|
||||
Width = view.Width,
|
||||
};
|
||||
picker.Style = picker.TryFindResource("BTSWindow") as Style;
|
||||
view.Height = Double.NaN;
|
||||
view.Width = Double.NaN;
|
||||
|
||||
vm.ok_action = () => {
|
||||
picker.Close();
|
||||
message_and_data.message.complete(vm.result_criteria).execute(_bus);
|
||||
};
|
||||
picker.move_to_mouse();
|
||||
picker.Show();
|
||||
}
|
||||
|
||||
public void Dispose() {
|
||||
|
||||
public void Dispose() =>
|
||||
Disposable.dispose(ref _dispose);
|
||||
|
||||
void show_pick_one(PartialCommand<SecurityMD> message) =>
|
||||
_show_picker(message, _fmt_pick_one_title, new ContractPickerModel(_bus, false, null), vm => vm.result);
|
||||
|
||||
void show_filtered_pick_one((PartialCommand<SecurityMD> message, SecurityCriteria global_filter) message_and_filter) =>
|
||||
_show_picker(message_and_filter.message, _fmt_pick_one_title, new ContractPickerModel(_bus, false, null, message_and_filter.global_filter), vm => vm.result);
|
||||
|
||||
void show_pick_multiple(PartialCommand<SecurityCriteria> message) =>
|
||||
_show_picker(message, _fmt_pick_multiple_title, new ContractPickerModel(_bus, true, null), vm => vm.result_criteria);
|
||||
|
||||
void show_and_edit_pick_multiple((PartialCommand<SecurityCriteria> message, SecurityCriteria existing_criteria) message_and_data) =>
|
||||
_show_picker(message_and_data.message, _fmt_pick_multiple_title, new ContractPickerModel(_bus, true, message_and_data.existing_criteria), vm => vm.result_criteria);
|
||||
|
||||
static string _fmt_pick_one_title(string message_title) => $"Select a Security for {message_title}";
|
||||
static string _fmt_pick_multiple_title(string message_title) => $"Select Securities for {message_title}";
|
||||
|
||||
void _show_picker<T>(PartialCommand<T> message, Func<string, string> fmt_title, ContractPickerModel vm, Func<ContractPickerModel, T> select_result) {
|
||||
var icon = message.icon;
|
||||
if (icon == null) {
|
||||
// not neccessary grind to hault just bc the icon is null, but it is most likely a dev-mistake that should be addressed.
|
||||
handle_bad_icon("a null icon");
|
||||
} else if (!icon.IsFrozen) {
|
||||
handle_bad_icon("an icon that wasn't frozen (not threadsafe)");
|
||||
}
|
||||
//
|
||||
void handle_bad_icon(string icon_error_desc) {
|
||||
Log.Api.warn($"{nameof(SecurityPickerDaemon)} received a message '{message.title}' with {icon_error_desc}, will use {nameof(Icons.AdminFrozen)}.");
|
||||
icon = Icons.AdminFrozen;
|
||||
}
|
||||
//
|
||||
var cpv = new ContractPickerView(vm);
|
||||
var window = new Window {
|
||||
Content = cpv,
|
||||
Title = fmt_title(message.title),
|
||||
Icon = message.icon,
|
||||
Height = cpv.Height,
|
||||
Width = cpv.Width,
|
||||
};
|
||||
window.Style = window.TryFindResource("BTSWindow") as Style;
|
||||
cpv.Width = double.NaN;
|
||||
cpv.Height = double.NaN;
|
||||
|
||||
vm.ok_action = () => {
|
||||
window.Close();
|
||||
message.complete(select_result(vm)).execute(_bus);
|
||||
};
|
||||
window.move_to_mouse();
|
||||
window.Show();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -15,6 +15,11 @@ namespace mbts.ui {
|
||||
PlayGeometryKey = nameof(PlayGeometryKey),
|
||||
ToolsGeometryKey = nameof(ToolsGeometryKey);
|
||||
|
||||
static Icons() {
|
||||
// TODO: probably do this for all icons, only reason for holding back is the uncertainity of any unexpected impacts
|
||||
AdminFrozen = Admin.frozen();
|
||||
}
|
||||
|
||||
public static Geometry PlayGeometry => Geometry.Parse(_get_geometric_path(PlayGeometryKey).FirstOrDefault() ?? string.Empty);
|
||||
|
||||
static readonly string base_uri = "pack://application:,,,/Images/Icons/";
|
||||
@@ -32,6 +37,7 @@ namespace mbts.ui {
|
||||
#pragma warning disable CS0618 // Type or member is obsolete
|
||||
public static ImageSource Logo { get { return load_image("logo.ico"); } }
|
||||
public static ImageSource Admin { get { return (DrawingImage)_resources["Admin"]; } }
|
||||
public static ImageSource AdminFrozen { get; }
|
||||
public static ImageSource Analytics { get { return (DrawingImage)_resources["Analytics"]; } }
|
||||
public static ImageSource Sheets { get { return (DrawingImage)_resources["Sheets"]; } }
|
||||
public static ImageSource Trades { get { return (DrawingImage)_resources["Trades"]; } }
|
||||
|
||||
@@ -13,7 +13,7 @@ using System.Windows;
|
||||
|
||||
namespace mbts.spark {
|
||||
class MarketViewWindow : SparkWindow<MarketViewWindowFactory.StartupData>, ISharedWindow {
|
||||
const string _window_type = "MarketView", _thread_id = "MarketView";
|
||||
const string _window_type = "MarketView", _thread_id = "MarketView", _window_type_display_name = "Market View";
|
||||
readonly OrdersModel _orders_model;
|
||||
readonly AllowOnce _init_guard = new AllowOnce("MarketView");
|
||||
MarketViewVM _vm;
|
||||
@@ -44,10 +44,8 @@ namespace mbts.spark {
|
||||
var state_src = Observable.FromEvent<Action<MarketViewWindowFactory.StartupData>, MarketViewWindowFactory.StartupData>(cb => _state_changed += cb, cb => _state_changed -= cb).StartWith(_state);
|
||||
_vm = new MarketViewVM(_bus, _orders_model, state_src);
|
||||
_view = new MarketViewView { DataContext = _vm };
|
||||
var update_securities_tag = new SparkTags.SparkTag<SecurityCriteria>("MarketView Callback");
|
||||
var update_securities_cmd = SparkCommand.create("Update Market View", Icon, update_securities_tag);
|
||||
var update_securities_cmd = SparkCommands.change_securities_callback(_window_type_display_name);
|
||||
_commands = new List<SparkCommand> {
|
||||
SparkCommand.create("Change Securities", Icons.Admin, SparkTags.ShowAndEditPickMultiple, () => (update_securities_cmd, _state.security_criteria)),
|
||||
SparkCommands.ShowLadders.complete(_vm.selected_security_mds_observable(), smds => smds.Count > 0),
|
||||
SparkCommands.ShowOrderTicketFromSecurity.complete(_vm.current_security_md, md => md.HasValue, ObjectHelper.ValueOrDefault),
|
||||
SparkCommands.ShowFills.complete(_vm.selected_securities_observable(), _ => true,
|
||||
@@ -56,9 +54,10 @@ namespace mbts.spark {
|
||||
})
|
||||
),
|
||||
SparkCommands.ShowTimeAndSales.complete(_vm.selected_securities_observable(), _ => true, secs => secs.Count > 0 ? new SecurityCriteria(secs) : _state.security_criteria),
|
||||
SparkCommands.ShowSyntheticCreate.complete(_vm.selected_securities_observable(), secs => secs.Count > 0 && secs.Count <= 24, secs => new SecurityCriteria(secs))
|
||||
SparkCommands.ShowSyntheticCreate.complete(_vm.selected_securities_observable(), secs => secs.Count > 0 && secs.Count <= 24, secs => new SecurityCriteria(secs)),
|
||||
SparkCommands.change_securities_command(() => (update_securities_cmd, _state.security_criteria))
|
||||
};
|
||||
_subscriptions = _bus.subscribe(update_securities_tag).OnDispatcher().Subscribe(c =>
|
||||
_subscriptions = _bus.subscribe(update_securities_cmd.tag).OnDispatcher().Subscribe(c =>
|
||||
_state_changed?.Invoke(_state = new MarketViewWindowFactory.StartupData(c, _vm.rows_view.GetSortingCriteria(), _vm.get_filter_states())));
|
||||
}
|
||||
|
||||
@@ -68,4 +67,4 @@ namespace mbts.spark {
|
||||
Commands.OfType<IDisposable>().DisposeAll();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -17,7 +17,7 @@ using static mbts.ui.controls.DIYGrid;
|
||||
|
||||
namespace mbts.spark {
|
||||
class TimeAndSalesWindow : SparkWindow<StartupData>, ISlowWindow {
|
||||
const string _window_type = "TimeAndSales";
|
||||
const string _window_type = "TimeAndSales", _window_type_display_name = "Time And Sales";
|
||||
readonly MDConsumer _consumer;
|
||||
readonly TimeAndSalesWindowFactory _factory;
|
||||
SingleValuePump<TimeAndSalesVM> _vm;
|
||||
@@ -56,18 +56,17 @@ namespace mbts.spark {
|
||||
public void thread_init() {
|
||||
_dispose_resources();
|
||||
_vm = new SingleValuePump<TimeAndSalesVM>();
|
||||
var update_securities_tag = new SparkTags.SparkTag<SecurityCriteria>("TimeAndSales Callback");
|
||||
var update_securities_cmd = SparkCommand.create("Update Time and Sales", Icon, update_securities_tag);
|
||||
var update_securities_cmd = SparkCommands.change_securities_callback(_window_type_display_name);
|
||||
var current_smd_source = _vm.observable.SelectMany(vm => vm.current_security_md_observable(_bus)).OnDispatcher();
|
||||
var selected_secs_source = _vm.observable.SelectMany(vm => vm.selected_securities_observable()).OnDispatcher();
|
||||
_commands = new SparkCommand[] {
|
||||
SparkCommand.create("Change Securities", Icons.Admin, SparkTags.ShowAndEditPickMultiple, () => (update_securities_cmd, _state.security_criteria)),
|
||||
SparkCommands.ShowLadder.complete(current_smd_source, md => md.HasValue, ObjectHelper.ValueOrDefault),
|
||||
SparkCommands.ShowOrderTicketFromSecurity.complete(current_smd_source, md => md.HasValue, ObjectHelper.ValueOrDefault),
|
||||
SparkCommands.ShowFills.complete(selected_secs_source, always_true, get_fills_startup_data),
|
||||
SparkCommands.ShowMarketView.complete(selected_secs_source, always_true, secs => secs.Count > 0 ? new SecurityCriteria(secs) : _state.security_criteria)
|
||||
SparkCommands.ShowMarketView.complete(selected_secs_source, always_true, secs => secs.Count > 0 ? new SecurityCriteria(secs) : _state.security_criteria),
|
||||
SparkCommands.change_securities_command(() => (update_securities_cmd, _state.security_criteria))
|
||||
};
|
||||
_subscriptions = _bus.subscribe(update_securities_tag).OnDispatcher().Subscribe(update_criteria);
|
||||
_subscriptions = _bus.subscribe(update_securities_cmd.tag).OnDispatcher().Subscribe(update_criteria);
|
||||
_initialize();
|
||||
|
||||
bool always_true<T>(T _) => true;
|
||||
|
||||
@@ -42,7 +42,7 @@ namespace bts.ui {
|
||||
|
||||
_bus = bus;
|
||||
}
|
||||
public ImageSource icon => Icons.Admin;
|
||||
public ImageSource icon => Icons.AdminFrozen;
|
||||
|
||||
public string name => "Settings";
|
||||
|
||||
|
||||
@@ -106,7 +106,7 @@ namespace mbts.spark {
|
||||
Icons.DownArrow,
|
||||
_vm.expand_all_rows_command);
|
||||
|
||||
_show_grid_settings_command = SparkCommands.grid_settings_command(_vm.grid_settings_manager.launch_settings_editor);
|
||||
_show_grid_settings_command = SparkCommands.window_settings_command(_vm.grid_settings_manager.launch_settings_editor);
|
||||
|
||||
_commands = new SparkCommand[] {
|
||||
_show_fills_command,
|
||||
|
||||
@@ -70,7 +70,7 @@ namespace bts.spark
|
||||
public static SparkCommand ShowWorkspaces =>
|
||||
SparkCommand.create("Workspaces", Icons.FavoriteWindow, SparkTags.ShowWorkspaces);
|
||||
public static SparkCommand ShowSettings =>
|
||||
SparkCommand.create("Settings", Icons.Admin, SparkTags.ShowSettings);
|
||||
SparkCommand.create("Settings", Icons.AdminFrozen, SparkTags.ShowSettings);
|
||||
|
||||
// Support
|
||||
public static SparkCommand ShowManual =>
|
||||
@@ -111,7 +111,14 @@ namespace bts.spark
|
||||
public static PartialCommand<IEnumerable<(OrderDefinitionImmutable, double, uint)>> RecreateSelectedOrders =>
|
||||
SparkCommand.create("Recreate", Icons.Beaker, SparkTags.RecreateOrder);
|
||||
|
||||
public static SparkCommand grid_settings_command(IDialogCommand launch_settings_editor) =>
|
||||
new SparkCommandWrapper("Window Settings", Icons.Gear, launch_settings_editor);
|
||||
// TODO: remove this method, eventually want all windows to use window_settings_command()
|
||||
public static SparkCommand change_securities_command(Func<(PartialCommand<SecurityCriteria>, SecurityCriteria)> get_param) =>
|
||||
SparkCommand.create("Settings", Icons.AdminFrozen, SparkTags.ShowAndEditPickMultiple, get_param);
|
||||
|
||||
public static PartialCommand<SecurityCriteria> change_securities_callback(string window_name) =>
|
||||
SparkCommand.create(window_name, Icons.AdminFrozen, new SparkTags.SparkTag<SecurityCriteria>($"Change {window_name} securities callback"));
|
||||
|
||||
public static SparkCommand window_settings_command(IDialogCommand launch_settings_editor) =>
|
||||
new SparkCommandWrapper("Settings", Icons.AdminFrozen, launch_settings_editor);
|
||||
}
|
||||
}
|
||||
@@ -21,7 +21,7 @@
|
||||
<u:WindowStyle.TitleContentTemplate>
|
||||
<DataTemplate>
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<Image Margin="3,1" Source="{x:Static u:Icons.Gear}"/>
|
||||
<Image Margin="3,1" Source="{x:Static u:Icons.Admin}"/>
|
||||
<TextBlock Text="{Binding owner_title, StringFormat='{}\'{0}\' Window Settings'}"/>
|
||||
</StackPanel>
|
||||
</DataTemplate>
|
||||
|
||||
@@ -103,6 +103,11 @@ namespace mbts.ui {
|
||||
return pen;
|
||||
}
|
||||
|
||||
public static ImageSource frozen(this ImageSource image_source) {
|
||||
image_source.Freeze();
|
||||
return image_source;
|
||||
}
|
||||
|
||||
// Perform a breadth first traversal of all children returning any that match the predicate.
|
||||
// Matching children are *not* further traversed
|
||||
public static IEnumerable<FrameworkElement> visual_children_where(this FrameworkElement v, Func<FrameworkElement, bool> match) {
|
||||
|
||||
Reference in new issue
Block a user