mirror of
https://github.com/ckaczor/WorkIndicator.git
synced 2026-02-11 10:38:37 -05:00
Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 714bd0384a |
22
App.xaml.cs
22
App.xaml.cs
@@ -17,6 +17,7 @@ namespace WorkIndicator
|
|||||||
public static string UpdateUrl = "https://github.com/ckaczor/WorkIndicator";
|
public static string UpdateUrl = "https://github.com/ckaczor/WorkIndicator";
|
||||||
|
|
||||||
private Dispatcher _dispatcher;
|
private Dispatcher _dispatcher;
|
||||||
|
private InterprocessMessageListener _commandLineListener;
|
||||||
|
|
||||||
[STAThread]
|
[STAThread]
|
||||||
public static void Main(string[] args)
|
public static void Main(string[] args)
|
||||||
@@ -37,10 +38,10 @@ namespace WorkIndicator
|
|||||||
// Initialize the tray icon
|
// Initialize the tray icon
|
||||||
TrayIcon.Initialize();
|
TrayIcon.Initialize();
|
||||||
|
|
||||||
Task.Factory.StartNew(UpdateApp).ContinueWith(task => StartUpdate(task.Result.Result));
|
Task.Factory.StartNew(CheckUpdate).ContinueWith(task => StartApplication(task.Result.Result));
|
||||||
}
|
}
|
||||||
|
|
||||||
private void StartUpdate(bool updateRequired)
|
private void StartApplication(bool updateRequired)
|
||||||
{
|
{
|
||||||
if (updateRequired)
|
if (updateRequired)
|
||||||
return;
|
return;
|
||||||
@@ -58,6 +59,10 @@ namespace WorkIndicator
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Initialize the command line listener
|
||||||
|
_commandLineListener = new InterprocessMessageListener(WorkIndicator.Properties.Resources.ApplicationName);
|
||||||
|
_commandLineListener.MessageReceived += HandleCommandLine;
|
||||||
|
|
||||||
// Set automatic start into the registry
|
// Set automatic start into the registry
|
||||||
Current.SetStartWithWindows(Settings.Default.StartWithWindows);
|
Current.SetStartWithWindows(Settings.Default.StartWithWindows);
|
||||||
|
|
||||||
@@ -66,17 +71,22 @@ namespace WorkIndicator
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
private async Task<bool> UpdateApp()
|
private void HandleCommandLine(object sender, InterprocessMessageListener.InterprocessMessageEventArgs e)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task<bool> CheckUpdate()
|
||||||
{
|
{
|
||||||
return await UpdateCheck.CheckUpdate(HandleUpdateStatus);
|
return await UpdateCheck.CheckUpdate(HandleUpdateStatus);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void HandleUpdateStatus(UpdateCheck.UpdateStatus status, string message)
|
private void HandleUpdateStatus(UpdateCheck.UpdateStatus status, string message)
|
||||||
{
|
{
|
||||||
if (status == UpdateCheck.UpdateStatus.None)
|
if (status != UpdateCheck.UpdateStatus.Downloading)
|
||||||
message = WorkIndicator.Properties.Resources.Loading;
|
return;
|
||||||
|
|
||||||
// _dispatcher.Invoke(() => TrayIcon.SetText(message));
|
_dispatcher.Invoke(() => TrayIcon.ShowUpdateMessage(message));
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override void OnExit(ExitEventArgs e)
|
protected override void OnExit(ExitEventArgs e)
|
||||||
|
|||||||
@@ -68,9 +68,9 @@ namespace WorkIndicator
|
|||||||
_initialized = true;
|
_initialized = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void SetText(string text)
|
public static void ShowUpdateMessage(string text)
|
||||||
{
|
{
|
||||||
_trayIcon.Text = text;
|
_trayIcon.ShowBalloonTip(250, Resources.ApplicationName, text, ToolTipIcon.None);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void HandleContextMenuStripOpening(object sender, System.ComponentModel.CancelEventArgs e)
|
static void HandleContextMenuStripOpening(object sender, System.ComponentModel.CancelEventArgs e)
|
||||||
|
|||||||
Reference in New Issue
Block a user