ckaczor/WorkIndicator
1
0
Fork 0
mirror of https://github.com/ckaczor/WorkIndicator.git synced 2026-01-13 17:23:18 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add IPC listener and tweak update messages

Browse Source
This commit is contained in:
Chris Kaczor
2021-12-20 13:43:14 -05:00
parent fbb797968d
commit 714bd0384a
2 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
App.xaml.cs
View File

@@ -17,6 +17,7 @@ namespace WorkIndicator
public static string UpdateUrl = "https://github.com/ckaczor/WorkIndicator";
private Dispatcher _dispatcher;
private InterprocessMessageListener _commandLineListener;
[STAThread]
public static void Main(string[] args)
@@ -37,10 +38,10 @@ namespace WorkIndicator
// Initialize the tray icon
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)
return;
@@ -58,6 +59,10 @@ namespace WorkIndicator
return;
}
// Initialize the command line listener
_commandLineListener = new InterprocessMessageListener(WorkIndicator.Properties.Resources.ApplicationName);
_commandLineListener.MessageReceived += HandleCommandLine;
// Set automatic start into the registry
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);
}
private void HandleUpdateStatus(UpdateCheck.UpdateStatus status, string message)
{
if (status == UpdateCheck.UpdateStatus.None)
message = WorkIndicator.Properties.Resources.Loading;
if (status != UpdateCheck.UpdateStatus.Downloading)
return;
// _dispatcher.Invoke(() => TrayIcon.SetText(message));
_dispatcher.Invoke(() => TrayIcon.ShowUpdateMessage(message));
}
protected override void OnExit(ExitEventArgs e)

4
TrayIcon.cs
View File

@@ -68,9 +68,9 @@ namespace WorkIndicator
_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)