diff --git a/src/client/spark/Daemons/SecurityPickerDaemon.cs b/src/client/spark/Daemons/SecurityPickerDaemon.cs
index ef045523b..3a66461d8 100644
--- a/src/client/spark/Daemons/SecurityPickerDaemon.cs
+++ b/src/client/spark/Daemons/SecurityPickerDaemon.cs
@@ -32,8 +32,12 @@ namespace bts {
Window picker = new Window {
Content = view,
- SizeToContent = SizeToContent.WidthAndHeight
+ Height = view.Height,
+ Width = view.Width
};
+ view.Height = Double.NaN;
+ view.Width = Double.NaN;
+
picker.CommandBindings.Add(new CommandBinding(ApplicationCommands.Close, (sender, e) => picker.Close()));
vm.close_action = () => {
picker.Close();
@@ -49,8 +53,12 @@ namespace bts {
Window picker = new Window
{
Content = view,
- SizeToContent = SizeToContent.WidthAndHeight
+ Height = view.Height,
+ Width = view.Width
};
+ view.Height = Double.NaN;
+ view.Width = Double.NaN;
+
picker.CommandBindings.Add(new CommandBinding(ApplicationCommands.Close, (sender, e) => picker.Close()));
vm.close_action = () => {
picker.Close();
diff --git a/src/client/spark/view/Spark/ContractPicker/ContractPickerModel.cs b/src/client/spark/view/Spark/ContractPicker/ContractPickerModel.cs
index 8411af2b8..c96c19d94 100644
--- a/src/client/spark/view/Spark/ContractPicker/ContractPickerModel.cs
+++ b/src/client/spark/view/Spark/ContractPicker/ContractPickerModel.cs
@@ -25,6 +25,8 @@ namespace mbts.spark
internal class ContractPickerModel : ViewModelBase
{
+ private const string dot = "•";
+
public ContractPickerModel(IBus bus, bool edit_mode, SecurityCriteria instrument_criteria) {
_bus = bus;
if (instrument_criteria == null) {
@@ -35,22 +37,30 @@ namespace mbts.spark
is_edit_mode = edit_mode;
_subs.Add(_bus.subscribe(SecuritiesTag).Subscribe(on_securities_changed));
- add_criteria_command = new DelegateCommand(_ => {
- security_criteria.Add(new SecurityCriteriaClause() {
- pretty_name = criteria_input_name,
- exchanges = selected_exchanges.ToArray(),
- security_types = selected_security_types.ToArray(),
- symbols = selected_symbols.ToArray(),
- security_keys = selected_securities
- });
- criteria_input_name = string.Empty;
- ok_button_command.TryRaiseCanExecuteChanged();
- });
+ add_criteria_command = new DelegateCommand(
+ execute: _ => {
+ security_criteria.Add(new SecurityCriteriaClause() {
+ pretty_name = criteria_input_name,
+ exchanges = selected_exchanges.ToArray(),
+ security_types = selected_security_types.ToArray(),
+ symbols = selected_symbols.ToArray(),
+ security_keys = selected_securities
+ });
+ criteria_input_name = string.Empty;
+ ok_button_command.TryRaiseCanExecuteChanged();
+ remove_criteria_command.TryRaiseCanExecuteChanged();
+ },
+ can_execute: _ => { return !String.IsNullOrEmpty(criteria_input_name); }
+ );
- remove_criteria_command = new DelegateCommand(_ => {
- security_criteria.Remove(selected_security_criteria_clause);
- ok_button_command.TryRaiseCanExecuteChanged();
- });
+ remove_criteria_command = new DelegateCommand(
+ execute: _ => {
+ security_criteria.Remove(selected_security_criteria_clause);
+ ok_button_command.TryRaiseCanExecuteChanged();
+ remove_criteria_command.TryRaiseCanExecuteChanged();
+ },
+ can_execute: _ => { return security_criteria.Count > 0; }
+ );
ok_button_command = new DelegateCommand(
execute: _ => { close_action?.Invoke(); },
@@ -72,22 +82,22 @@ namespace mbts.spark
private void _compose_criteria_clause_name() {
string proposed_name = string.Empty;
if (selected_securities.Count > 0) {
- proposed_name = all_securities.Where(s => selected_securities.Contains(s.Key)).Select(sec => sec.Value.security.ToString()).Aggregate((i, j) => $"{i} and {j}");
+ proposed_name = all_securities.Where(s => selected_securities.Contains(s.Key)).Select(sec => sec.Value.security.ToString()).Aggregate((i, j) => $"{i} {dot} {j}");
} else if (selected_symbols.Count > 0) {
- proposed_name = $"{selected_symbols.Aggregate((i, j) => $"{i} and {j}")}";
+ proposed_name = $"{selected_symbols.Aggregate((i, j) => $"{i} {dot} {j}")}";
if (selected_security_types.Count > 0) {
- proposed_name += $" {selected_security_types.Select(sec_type => sec_type.ToString()).Aggregate((i, j) => $"{i}s and {j}s")}";
+ proposed_name += $" {selected_security_types.Select(sec_type => sec_type.ToString()).Aggregate((i, j) => $"{i} {dot} {j}")}";
}
if (selected_exchanges.Count > 0) {
- proposed_name += $" at {selected_exchanges.Select(exch => exch.ToString()).Aggregate((i, j) => $"{i} and {j}")}";
+ proposed_name += $" at {selected_exchanges.Select(exch => exch.ToString()).Aggregate((i, j) => $"{i} {dot} {j}")}";
}
} else if (selected_security_types.Count > 0) {
- proposed_name = $"{selected_security_types.Select(sec_type => sec_type.ToString()).Aggregate((i, j) => $"{i}s and {j}s")}";
+ proposed_name = $"{selected_security_types.Select(sec_type => sec_type.ToString()).Aggregate((i, j) => $"{i} {dot} {j}")}";
if (selected_exchanges.Count > 0) {
- proposed_name += $" at {selected_exchanges.Select(exch => exch.ToString()).Aggregate((i, j) => $"{i} and {j}")}";
+ proposed_name += $" at {selected_exchanges.Select(exch => exch.ToString()).Aggregate((i, j) => $"{i} {dot} {j}")}";
}
} else if (selected_exchanges.Count > 0) {
- proposed_name = $"{selected_exchanges.Select(exch => exch.ToString()).Aggregate((i, j) => $"{i} and {j}")}";
+ proposed_name = $"{selected_exchanges.Select(exch => exch.ToString()).Aggregate((i, j) => $"{i} {dot} {j}")}";
}
criteria_input_name = proposed_name;
}
@@ -180,6 +190,7 @@ namespace mbts.spark
set {
_criteria_input_name = value;
RaisePropertyChanged("criteria_input_name");
+ add_criteria_command.TryRaiseCanExecuteChanged();
}
}
diff --git a/src/client/spark/view/Spark/ContractPicker/ContractPickerView.xaml b/src/client/spark/view/Spark/ContractPicker/ContractPickerView.xaml
index 5acadfaaa..948a9c3de 100644
--- a/src/client/spark/view/Spark/ContractPicker/ContractPickerView.xaml
+++ b/src/client/spark/view/Spark/ContractPicker/ContractPickerView.xaml
@@ -4,63 +4,86 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:converters="clr-namespace:mbts.ui.converters"
+ xmlns:c="clr-namespace:mbts.ui.controls"
x:ClassModifier="internal"
- mc:Ignorable="d" d:DesignWidth="561.489">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
diff --git a/src/client/spark/view/Spark/ContractPicker/ContractPickerView.xaml.cs b/src/client/spark/view/Spark/ContractPicker/ContractPickerView.xaml.cs
index 8f8c2bbc2..b0aa6ed1a 100644
--- a/src/client/spark/view/Spark/ContractPicker/ContractPickerView.xaml.cs
+++ b/src/client/spark/view/Spark/ContractPicker/ContractPickerView.xaml.cs
@@ -99,7 +99,7 @@ namespace mbts.spark
}
- [Export(typeof(IShellModule))]
+ //[Export(typeof(IShellModule))]
public class TempModule : IShellModule {
private IBus _bus;
@@ -135,7 +135,7 @@ namespace mbts.spark
var x = new Window {
Content = new ContractPickerView(new ContractPickerModel(_bus, false, null))
};
- x.SizeToContent = SizeToContent.WidthAndHeight;
+ //x.SizeToContent = SizeToContent.WidthAndHeight;
x.Show();
}
}