diff --git a/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml b/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml
index f6fe62e71..b81bc3618 100644
--- a/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml
+++ b/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml
@@ -3,6 +3,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:ord="clr-namespace:bts.api.orderman;assembly=spark_api"
xmlns:u="clr-namespace:mbts.ui"
+ xmlns:ut="clr-namespace:mbts.ui.utilities"
xmlns:c="clr-namespace:mbts.ui.controls"
xmlns:usp="clr-namespace:mbts.ui.spark"
xmlns:uag="clr-namespace:mbts.ui.spark.algo"
@@ -177,7 +178,7 @@
-
+
Detach on Toward
@@ -279,8 +280,6 @@
-
-
@@ -355,9 +354,9 @@
-
+
-
+
@@ -656,12 +655,10 @@
-
+
-
-
-
+
@@ -680,7 +677,7 @@
-
+
@@ -693,7 +690,7 @@
-
+
@@ -706,7 +703,7 @@
-
+
@@ -719,7 +716,7 @@
-
+
@@ -732,7 +729,7 @@
-
+
@@ -745,7 +742,7 @@
-
+
@@ -766,15 +763,6 @@
-
diff --git a/src/client/spark/view/Utility/DisplayNameHelper.cs b/src/client/spark/view/Utility/DisplayNameHelper.cs
index 21e3ff1ab..853bb326a 100644
--- a/src/client/spark/view/Utility/DisplayNameHelper.cs
+++ b/src/client/spark/view/Utility/DisplayNameHelper.cs
@@ -17,18 +17,34 @@ namespace mbts.ui.utilities {
}
static class DisplayNameHelper {
- public static IValueConverter CamelCaseSpacesConverter =
- new AnonymousValueConverter(obj => obj == null ? string.Empty : _insert_spaces_to_camel_case(obj.ToString()));
+ public static IValueConverter
+ CamelCaseSpacesConverter = ValueConverter.create(obj => _insert_spaces_to_camel_case(obj?.ToString())),
+ SnakeToTitleCaseConverter = ValueConverter.create(obj => snake_to_title_case(obj?.ToString()));
// Adds spaces to CamelCase => "Camel Case"
public static string camel_to_title_case(string name, TextCapitalizationFormat capitalization_format = TextCapitalizationFormat.Default) {
- string with_spaces = _insert_spaces_to_camel_case(name);
- switch (capitalization_format) {
- case TextCapitalizationFormat.FirstLetterFirstWord: return Regex.Replace(with_spaces, @"\b \b\w(?![A-Z])", m => _first_letter_lower_case(m.Value));
- case TextCapitalizationFormat.FirstLetterEveryWord: return Regex.Replace(with_spaces, @"\b\w(?![A-Z])", m => _first_letter_lower_case(m.Value));
- case TextCapitalizationFormat.Default:
- default: return with_spaces;
+ if (name != null) {
+ string with_spaces = _insert_spaces_to_camel_case(name);
+ switch (capitalization_format) {
+ case TextCapitalizationFormat.FirstLetterFirstWord: return Regex.Replace(with_spaces, @"\b \b\w(?![A-Z])", m => _first_letter_lower_case(m.Value));
+ case TextCapitalizationFormat.FirstLetterEveryWord: return Regex.Replace(with_spaces, @"\b\w(?![A-Z])", m => _first_letter_lower_case(m.Value));
+ case TextCapitalizationFormat.Default:
+ default: return with_spaces;
+ }
}
+ return string.Empty;
+ }
+
+ public static string snake_to_title_case(string name) {
+ if (name != null) {
+ var m = Regex.Match(name, @"[A-Za-z1-9_\-]*");
+ if (m.Success) {
+ name = Regex.Replace(m.Value, @"(_|-)*(.*)", "$+");
+ name = name.Replace('_', ' ');
+ return CultureInfo.CurrentCulture.TextInfo.ToTitleCase(name);
+ }
+ }
+ return string.Empty;
}
public static int compare_alpha_numeric(string a, string b) {