From 673e8c8e9dd2ec44525cadb13225bcefad95b5d3 Mon Sep 17 00:00:00 2001 From: DB p Date: Sat, 19 Nov 2022 14:33:27 +0900 Subject: [PATCH 1/2] Add Datetimeformat --- .../ViewModel/SettingWindowViewModel.cs | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs index 5066d0ca6..d48e64380 100644 --- a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs +++ b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs @@ -455,9 +455,13 @@ namespace Flow.Launcher.ViewModel public List TimeFormatList { get; set; } = new List() { + "h:mm", "hh:mm", + "H:mm", "HH:mm", + "tt h:mm", "tt hh:mm", + "h:mm tt", "hh:mm tt" }; @@ -466,7 +470,10 @@ namespace Flow.Launcher.ViewModel "MM'/'dd dddd", "MM'/'dd ddd", "MM'/'dd", + "MM'-'dd", + "MMMM', 'dd", "dd'/'MM", + "dd'-'MM", "ddd MM'/'dd", "dddd MM'/'dd", "dddd", @@ -500,6 +507,15 @@ namespace Flow.Launcher.ViewModel TimeFormatDisplayList[i] = DateTime.Now.ToString(TimeFormatList[i], CultureInfo.CurrentCulture); } + TimeFormatDisplayList[0] = DateTime.Now.ToString(TimeFormatList[0], CultureInfo.CurrentCulture) + " (h:mm)"; + TimeFormatDisplayList[1] = DateTime.Now.ToString(TimeFormatList[1], CultureInfo.CurrentCulture) + " (hh:mm)"; + TimeFormatDisplayList[2] = DateTime.Now.ToString(TimeFormatList[2], CultureInfo.CurrentCulture) + " (H:mm)"; + TimeFormatDisplayList[3] = DateTime.Now.ToString(TimeFormatList[3], CultureInfo.CurrentCulture) + " (HH:mm)"; + TimeFormatDisplayList[4] = DateTime.Now.ToString(TimeFormatList[4], CultureInfo.CurrentCulture) + " (tt h:mm)"; + TimeFormatDisplayList[5] = DateTime.Now.ToString(TimeFormatList[5], CultureInfo.CurrentCulture) + " (tt hh:mm)"; + TimeFormatDisplayList[6] = DateTime.Now.ToString(TimeFormatList[6], CultureInfo.CurrentCulture) + " (h:mm tt)"; + TimeFormatDisplayList[7] = DateTime.Now.ToString(TimeFormatList[6], CultureInfo.CurrentCulture) + " (hh:mm tt)"; + for (int i = 0; i < DateFormatList.Count; ++i) { DateFormatDisplayList[i] = DateTime.Now.ToString(DateFormatList[i], CultureInfo.CurrentCulture); From 32c7ca8ade8123067ccfccf75c369e040b227072 Mon Sep 17 00:00:00 2001 From: DB p Date: Sat, 19 Nov 2022 14:35:56 +0900 Subject: [PATCH 2/2] Remove Timeformat info --- Flow.Launcher/ViewModel/SettingWindowViewModel.cs | 9 --------- 1 file changed, 9 deletions(-) diff --git a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs index d48e64380..24229e9da 100644 --- a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs +++ b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs @@ -507,15 +507,6 @@ namespace Flow.Launcher.ViewModel TimeFormatDisplayList[i] = DateTime.Now.ToString(TimeFormatList[i], CultureInfo.CurrentCulture); } - TimeFormatDisplayList[0] = DateTime.Now.ToString(TimeFormatList[0], CultureInfo.CurrentCulture) + " (h:mm)"; - TimeFormatDisplayList[1] = DateTime.Now.ToString(TimeFormatList[1], CultureInfo.CurrentCulture) + " (hh:mm)"; - TimeFormatDisplayList[2] = DateTime.Now.ToString(TimeFormatList[2], CultureInfo.CurrentCulture) + " (H:mm)"; - TimeFormatDisplayList[3] = DateTime.Now.ToString(TimeFormatList[3], CultureInfo.CurrentCulture) + " (HH:mm)"; - TimeFormatDisplayList[4] = DateTime.Now.ToString(TimeFormatList[4], CultureInfo.CurrentCulture) + " (tt h:mm)"; - TimeFormatDisplayList[5] = DateTime.Now.ToString(TimeFormatList[5], CultureInfo.CurrentCulture) + " (tt hh:mm)"; - TimeFormatDisplayList[6] = DateTime.Now.ToString(TimeFormatList[6], CultureInfo.CurrentCulture) + " (h:mm tt)"; - TimeFormatDisplayList[7] = DateTime.Now.ToString(TimeFormatList[6], CultureInfo.CurrentCulture) + " (hh:mm tt)"; - for (int i = 0; i < DateFormatList.Count; ++i) { DateFormatDisplayList[i] = DateTime.Now.ToString(DateFormatList[i], CultureInfo.CurrentCulture);