diff --git a/Flow.Launcher/MainWindow.xaml b/Flow.Launcher/MainWindow.xaml index db015392a..f1e917ea2 100644 --- a/Flow.Launcher/MainWindow.xaml +++ b/Flow.Launcher/MainWindow.xaml @@ -96,6 +96,10 @@ + + + + diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs index 95e7ed6a8..7160fae88 100644 --- a/Flow.Launcher/MainWindow.xaml.cs +++ b/Flow.Launcher/MainWindow.xaml.cs @@ -11,6 +11,8 @@ using Flow.Launcher.Core.Resource; using Flow.Launcher.Helper; using Flow.Launcher.Infrastructure.UserSettings; using Flow.Launcher.ViewModel; +using System.Windows.Threading; +using System.Globalization; using Application = System.Windows.Application; using Screen = System.Windows.Forms.Screen; using ContextMenuStrip = System.Windows.Forms.ContextMenuStrip; @@ -31,7 +33,6 @@ namespace Flow.Launcher private Settings _settings; private NotifyIcon _notifyIcon; private MainViewModel _viewModel; - #endregion public MainWindow(Settings settings, MainViewModel mainVM) @@ -39,14 +40,30 @@ namespace Flow.Launcher DataContext = mainVM; _viewModel = mainVM; _settings = settings; + + DispatcherTimer timer = new DispatcherTimer(); + timer.Interval = new TimeSpan(0, 0, 1); + timer.Tick += Timer_Tick; + timer.Start(); InitializeComponent(); } public MainWindow() { + InitializeComponent(); + + } + private void Timer_Tick(object sender, EventArgs e) + { + ClockBox.Text = System.DateTime.Now.ToString("tt hh:mm"); + DateBox.Text = System.DateTime.Now.ToString("ddd MM/dd", CultureInfo.InvariantCulture); + + } + + private async void OnClosing(object sender, CancelEventArgs e) { _notifyIcon.Visible = false; diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml index a8f17d013..3be12fc0e 100644 --- a/Flow.Launcher/SettingWindow.xaml +++ b/Flow.Launcher/SettingWindow.xaml @@ -586,7 +586,10 @@ - + + + + diff --git a/Flow.Launcher/Themes/Base.xaml b/Flow.Launcher/Themes/Base.xaml index fba804b10..5395eef21 100644 --- a/Flow.Launcher/Themes/Base.xaml +++ b/Flow.Launcher/Themes/Base.xaml @@ -270,6 +270,28 @@ + + + + + + + + \ No newline at end of file diff --git a/Flow.Launcher/Themes/Sublime.xaml b/Flow.Launcher/Themes/Sublime.xaml index e50230f33..e81a0b6e7 100644 --- a/Flow.Launcher/Themes/Sublime.xaml +++ b/Flow.Launcher/Themes/Sublime.xaml @@ -59,7 +59,7 @@ - #3c454e + #3C454E @@ -100,5 +100,44 @@ + + + + + +