From 95e6c19cef96c49b9b800d5080b14e5b2ebc6faf Mon Sep 17 00:00:00 2001 From: Hongtao Zhang Date: Sat, 19 Nov 2022 16:11:13 -0600 Subject: [PATCH] Revert "Use Converter to transform format to actual display" This reverts commit 7b90808b43da615c91912f7cfad088bf386e0f71. --- .../DateTimeFormatToNowConverter.cs | 19 - Flow.Launcher/SettingWindow.xaml | 1666 ++++++++--------- Flow.Launcher/SettingWindow.xaml.cs | 24 + .../ViewModel/SettingWindowViewModel.cs | 99 +- 4 files changed, 888 insertions(+), 920 deletions(-) delete mode 100644 Flow.Launcher/Converters/DateTimeFormatToNowConverter.cs diff --git a/Flow.Launcher/Converters/DateTimeFormatToNowConverter.cs b/Flow.Launcher/Converters/DateTimeFormatToNowConverter.cs deleted file mode 100644 index 3c46fd01a..000000000 --- a/Flow.Launcher/Converters/DateTimeFormatToNowConverter.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System; -using System.Globalization; -using System.Windows.Data; - -namespace Flow.Launcher.Converters -{ - public class DateTimeFormatToNowConverter : IValueConverter - { - - public object Convert(object value, Type targetType, object parameter, CultureInfo culture) - { - return value is not string format ? null : DateTime.Now.ToString(format); - } - public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) - { - throw new NotImplementedException(); - } - } -} diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml index 5b841978f..bc0ff1ce4 100644 --- a/Flow.Launcher/SettingWindow.xaml +++ b/Flow.Launcher/SettingWindow.xaml @@ -1,4 +1,5 @@ - - + - + - + @@ -47,15 +44,12 @@ - - + - + @@ -65,172 +59,127 @@ - - - - - - - - - - - - - - - - - - - - - + @@ -717,11 +606,13 @@ - - - + @@ -738,24 +628,25 @@ - + - - - - + - + - @@ -781,10 +672,10 @@ - + - @@ -794,14 +685,13 @@ - + - + - @@ -812,26 +702,24 @@ - - + + - - + - + - - - + + - @@ -865,16 +752,14 @@ - + - - + + - - + - + - @@ -905,12 +789,11 @@ - - + + - @@ -920,46 +803,52 @@ - - - - + - - - - - + - - - - - + - - + - - + - -