aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKazuki Yamaguchi <k@rhe.jp>2019-10-06 15:27:07 +0900
committerKazuki Yamaguchi <k@rhe.jp>2019-10-06 15:27:12 +0900
commit40d2ca5120162d834181ccae1f7941407cff1830 (patch)
treebc38fde3448b679c8f94f1e8467d3846f268acc2
parent140f0ddcfb67614fca835b43b003d41a2d936608 (diff)
downloadwf-clock-40d2ca5120162d834181ccae1f7941407cff1830.tar.gz
cleanup unnecessary code
-rw-r--r--WarframeClock/App.xaml.cs10
-rw-r--r--WarframeClock/StandaloneOverlayWindow.xaml2
-rw-r--r--WarframeClock/StandaloneOverlayWindow.xaml.cs2
3 files changed, 5 insertions, 9 deletions
diff --git a/WarframeClock/App.xaml.cs b/WarframeClock/App.xaml.cs
index f5f92f3..8b7025d 100644
--- a/WarframeClock/App.xaml.cs
+++ b/WarframeClock/App.xaml.cs
@@ -1,10 +1,6 @@
using System;
using System.Diagnostics;
-using System.Globalization;
using System.IO;
-using System.Linq;
-using System.Text.RegularExpressions;
-using System.Threading;
using System.Windows;
using System.Windows.Threading;
@@ -44,17 +40,17 @@ namespace WarframeClock
// Prepare System Tray icon
var iconMenu = new System.Windows.Forms.ContextMenu();
- iconMenu.MenuItems.Add(new System.Windows.Forms.MenuItem(App.VersionString) { Enabled = false });
+ iconMenu.MenuItems.Add(new System.Windows.Forms.MenuItem(VersionString) { Enabled = false });
iconMenu.MenuItems.Add(new System.Windows.Forms.MenuItem("Configure",
(_, __) => new SettingsWindow(_vm).Show()));
iconMenu.MenuItems.Add(new System.Windows.Forms.MenuItem("Quit",
- (_, __) => ((App)Application.Current).Terminate()));
+ (_, __) => Terminate()));
_notifyIcon = new System.Windows.Forms.NotifyIcon
{
ContextMenu = iconMenu,
Icon = WarframeClock.Properties.Resources.TrayIcon,
- Text = $"Warframe Clock - {App.VersionString}",
+ Text = $"Warframe Clock - {VersionString}",
Visible = true
};
_notifyIcon.Click += (_, __) => MainWindow.Show();
diff --git a/WarframeClock/StandaloneOverlayWindow.xaml b/WarframeClock/StandaloneOverlayWindow.xaml
index fe70344..b09fbb6 100644
--- a/WarframeClock/StandaloneOverlayWindow.xaml
+++ b/WarframeClock/StandaloneOverlayWindow.xaml
@@ -6,7 +6,7 @@
xmlns:local="clr-namespace:WarframeClock"
mc:Ignorable="d"
d:DataContext="{d:DesignInstance local:OverlayWindowViewModel, IsDesignTimeCreatable=True}"
- Title="WarframeClock StandaloneOverlayWindow"
+ Title="WarframeClock"
Background="Black" ResizeMode="CanMinimize" SizeToContent="WidthAndHeight"
Topmost="{Binding StandaloneAlwaysOnTop}"
MouseDown="Window_MouseDown">
diff --git a/WarframeClock/StandaloneOverlayWindow.xaml.cs b/WarframeClock/StandaloneOverlayWindow.xaml.cs
index 86cdcc1..df929cd 100644
--- a/WarframeClock/StandaloneOverlayWindow.xaml.cs
+++ b/WarframeClock/StandaloneOverlayWindow.xaml.cs
@@ -48,7 +48,7 @@ namespace WarframeClock
}
}
- private void Window_MouseDown(object sender, System.Windows.Input.MouseButtonEventArgs e)
+ private void Window_MouseDown(object sender, MouseButtonEventArgs e)
{
if (e.LeftButton == MouseButtonState.Pressed)
DragMove();