mirror of
https://github.com/ckaczor/WorkIndicator.git
synced 2026-02-11 02:32:38 -05:00
Compare commits
13 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 896427ba75 | |||
| a98f87a630 | |||
| a0eb5e3fbc | |||
| 18aae0cef3 | |||
| 0c8ec51660 | |||
| 1e0d3928c6 | |||
| 312c4c5c06 | |||
| 287c008117 | |||
| 42301d5242 | |||
| 3d10cc9635 | |||
| 714bd0384a | |||
| fbb797968d | |||
| e609bebbbc |
82
App.xaml.cs
82
App.xaml.cs
@@ -1,8 +1,11 @@
|
||||
using Common.Helpers;
|
||||
using Common.IO;
|
||||
using Common.Wpf.Extensions;
|
||||
using Serilog;
|
||||
using Squirrel;
|
||||
using System;
|
||||
using System.IO;
|
||||
using System.Reflection;
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows;
|
||||
using System.Windows.Threading;
|
||||
@@ -17,12 +20,26 @@ namespace WorkIndicator
|
||||
public static string UpdateUrl = "https://github.com/ckaczor/WorkIndicator";
|
||||
|
||||
private Dispatcher _dispatcher;
|
||||
private InterprocessMessageListener _commandLineListener;
|
||||
|
||||
[STAThread]
|
||||
public static void Main(string[] args)
|
||||
{
|
||||
SquirrelAwareApp.HandleEvents(onAppUpdate: version => Common.Settings.Extensions.RestoreSettings());
|
||||
|
||||
var location = Assembly.GetEntryAssembly().Location;
|
||||
|
||||
var path = Path.GetDirectoryName(location);
|
||||
|
||||
var logFile = Path.Combine(path, "log.txt");
|
||||
|
||||
Log.Logger = new LoggerConfiguration()
|
||||
.MinimumLevel.Debug()
|
||||
.WriteTo.File(logFile, rollingInterval: RollingInterval.Day)
|
||||
.CreateLogger();
|
||||
|
||||
Log.Logger.Debug($"Startup");
|
||||
|
||||
var application = new App();
|
||||
application.InitializeComponent();
|
||||
application.Run();
|
||||
@@ -34,53 +51,62 @@ namespace WorkIndicator
|
||||
|
||||
_dispatcher = Dispatcher.CurrentDispatcher;
|
||||
|
||||
// Create an isolation handle to see if we are already running
|
||||
_isolationHandle = ApplicationIsolation.GetIsolationHandle();
|
||||
|
||||
// If there is another copy then pass it the command line and exit
|
||||
if (_isolationHandle == null)
|
||||
{
|
||||
try
|
||||
{
|
||||
InterprocessMessageSender.SendMessage(Environment.CommandLine);
|
||||
}
|
||||
catch { }
|
||||
|
||||
Shutdown();
|
||||
return;
|
||||
}
|
||||
|
||||
// Initialize the command line listener
|
||||
_commandLineListener = new InterprocessMessageListener(Assembly.GetEntryAssembly().GetName().Name);
|
||||
_commandLineListener.MessageReceived += HandleCommandLine;
|
||||
|
||||
// Initialize the tray icon
|
||||
TrayIcon.Initialize();
|
||||
|
||||
Task.Factory.StartNew(UpdateApp).ContinueWith(task => StartUpdate(task.Result.Result));
|
||||
// Set automatic start into the registry
|
||||
Current.SetStartWithWindows(Settings.Default.StartWithWindows);
|
||||
|
||||
// Initialize the light controller
|
||||
LightController.Initialize();
|
||||
|
||||
Task.Factory.StartNew(CheckUpdate);
|
||||
}
|
||||
|
||||
private void StartUpdate(bool updateRequired)
|
||||
private void HandleCommandLine(object sender, InterprocessMessageListener.InterprocessMessageEventArgs e)
|
||||
{
|
||||
if (updateRequired)
|
||||
return;
|
||||
|
||||
Task.Factory.StartNew(() =>
|
||||
{
|
||||
// Create an isolation handle to see if we are already running
|
||||
_isolationHandle = ApplicationIsolation.GetIsolationHandle();
|
||||
|
||||
// If there is another copy then pass it the command line and exit
|
||||
if (_isolationHandle == null)
|
||||
{
|
||||
InterprocessMessageSender.SendMessage(Environment.CommandLine);
|
||||
Shutdown();
|
||||
return;
|
||||
}
|
||||
|
||||
// Set automatic start into the registry
|
||||
Current.SetStartWithWindows(Settings.Default.StartWithWindows);
|
||||
|
||||
// Initialize the light controller
|
||||
LightController.Initialize();
|
||||
});
|
||||
}
|
||||
|
||||
private async Task<bool> UpdateApp()
|
||||
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.Installing)
|
||||
return;
|
||||
|
||||
_dispatcher.Invoke(() => TrayIcon.SetText(message));
|
||||
_dispatcher.Invoke(() => TrayIcon.ShowUpdateMessage(message));
|
||||
|
||||
TrayIcon.Dispose();
|
||||
}
|
||||
|
||||
protected override void OnExit(ExitEventArgs e)
|
||||
{
|
||||
Log.Logger.Debug($"Exit");
|
||||
|
||||
// Get rid of the light controller
|
||||
LightController.Dispose();
|
||||
|
||||
@@ -88,7 +114,7 @@ namespace WorkIndicator
|
||||
TrayIcon.Dispose();
|
||||
|
||||
// Get rid of the isolation handle
|
||||
_isolationHandle.Dispose();
|
||||
_isolationHandle?.Dispose();
|
||||
|
||||
base.OnExit(e);
|
||||
}
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
using CSCore.CoreAudioAPI;
|
||||
using Serilog;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
@@ -16,11 +17,19 @@ namespace WorkIndicator
|
||||
|
||||
public static event MicrophoneInUseChangedDelegate MicrophoneInUseChanged;
|
||||
|
||||
private static Thread _thread;
|
||||
|
||||
private static readonly List<AudioSessionManager2> _sessionManagers = new List<AudioSessionManager2>();
|
||||
|
||||
private static readonly ILogger Logger = Log.Logger;
|
||||
|
||||
public static void Start()
|
||||
{
|
||||
Logger.Debug("AudioWatcher - Start");
|
||||
|
||||
_manualResetEvent = new ManualResetEvent(false);
|
||||
|
||||
var thread = new Thread(delegate ()
|
||||
_thread = new Thread(delegate ()
|
||||
{
|
||||
var deviceEnumerator = new MMDeviceEnumerator();
|
||||
|
||||
@@ -28,11 +37,11 @@ namespace WorkIndicator
|
||||
{
|
||||
var sessionManager = AudioSessionManager2.FromMMDevice(device);
|
||||
|
||||
var sessionEnumerator = sessionManager.GetSessionEnumerator();
|
||||
_sessionManagers.Add(sessionManager);
|
||||
|
||||
sessionManager.SessionCreated += (sessionSender, sessionCreatedEventArgs) => HandleDeviceSession(device, sessionCreatedEventArgs.NewSession);
|
||||
|
||||
foreach (var audioSessionControl in sessionEnumerator)
|
||||
foreach (var audioSessionControl in sessionManager.GetSessionEnumerator())
|
||||
{
|
||||
HandleDeviceSession(device, audioSessionControl);
|
||||
}
|
||||
@@ -41,14 +50,16 @@ namespace WorkIndicator
|
||||
_manualResetEvent.WaitOne();
|
||||
});
|
||||
|
||||
thread.SetApartmentState(ApartmentState.MTA);
|
||||
thread.Start();
|
||||
_thread.SetApartmentState(ApartmentState.MTA);
|
||||
_thread.Start();
|
||||
}
|
||||
|
||||
private static void HandleDeviceSession(MMDevice device, AudioSessionControl audioSessionControl)
|
||||
{
|
||||
var deviceId = device.DeviceID + audioSessionControl.GroupingParam;
|
||||
|
||||
Logger.Debug($"AudioWatcher - HandleDeviceSession - {device.FriendlyName}, {deviceId}");
|
||||
|
||||
if (!ActiveSessions.ContainsKey(deviceId))
|
||||
ActiveSessions[deviceId] = 0;
|
||||
|
||||
@@ -60,11 +71,17 @@ namespace WorkIndicator
|
||||
|
||||
public static void Stop()
|
||||
{
|
||||
Logger.Debug("AudioWatcher - Stop");
|
||||
|
||||
_sessionManagers.Clear();
|
||||
|
||||
_manualResetEvent?.Set();
|
||||
}
|
||||
|
||||
private static void HandleAudioStateChanged(string deviceId, AudioSessionState newState)
|
||||
{
|
||||
Logger.Debug($"AudioWatcher - HandleAudioStateChanged - {deviceId}, {newState}");
|
||||
|
||||
switch (newState)
|
||||
{
|
||||
case AudioSessionState.AudioSessionStateActive:
|
||||
@@ -75,11 +92,14 @@ namespace WorkIndicator
|
||||
ActiveSessions[deviceId]--;
|
||||
break;
|
||||
case AudioSessionState.AudioSessionStateExpired:
|
||||
ActiveSessions[deviceId] = 0;
|
||||
break;
|
||||
default:
|
||||
throw new ArgumentOutOfRangeException();
|
||||
}
|
||||
|
||||
Logger.Debug($"AudioWatcher - HandleAudioStateChanged - {deviceId} = {ActiveSessions[deviceId]}");
|
||||
|
||||
MicrophoneInUseChanged?.Invoke(MicrophoneInUse());
|
||||
}
|
||||
|
||||
|
||||
2
Common
2
Common
Submodule Common updated: 6f528f7b59...4da8f426c0
Submodule Common.Wpf updated: 8a82786166...f299c18e22
@@ -15,20 +15,40 @@ namespace WorkIndicator
|
||||
public static class LightController
|
||||
{
|
||||
private static StoplightIndicator _stoplightIndicator;
|
||||
private static UsbService _usbService;
|
||||
private static bool _initialized;
|
||||
private static Status _status = Status.Auto;
|
||||
|
||||
public static void Initialize()
|
||||
{
|
||||
_usbService = new UsbService();
|
||||
_usbService.DevicesChanged += DevicesChanged;
|
||||
|
||||
_stoplightIndicator = new StoplightIndicator();
|
||||
_stoplightIndicator.SetLight(StoplightIndicator.Light.Yellow, StoplightIndicator.LightState.On);
|
||||
|
||||
Properties.Settings.Default.PropertyChanged += HandleSettingChange;
|
||||
|
||||
AudioWatcher.MicrophoneInUseChanged += AudioWatcher_MicrophoneInUseChanged;
|
||||
AudioWatcher.Start();
|
||||
|
||||
_initialized = true;
|
||||
}
|
||||
|
||||
private static void HandleSettingChange(object sender, System.ComponentModel.PropertyChangedEventArgs e)
|
||||
{
|
||||
if (e.PropertyName == nameof(Properties.Settings.Default.DefaultStatus))
|
||||
UpdateLights();
|
||||
}
|
||||
|
||||
private static void DevicesChanged()
|
||||
{
|
||||
_stoplightIndicator?.Dispose();
|
||||
_stoplightIndicator = new StoplightIndicator();
|
||||
|
||||
UpdateLights();
|
||||
}
|
||||
|
||||
private static void AudioWatcher_MicrophoneInUseChanged(bool microphoneInUse)
|
||||
{
|
||||
UpdateLights();
|
||||
@@ -44,6 +64,8 @@ namespace WorkIndicator
|
||||
_stoplightIndicator.SetLights(StoplightIndicator.LightState.Off, StoplightIndicator.LightState.Off, StoplightIndicator.LightState.Off);
|
||||
_stoplightIndicator.Dispose();
|
||||
|
||||
_usbService.Dispose();
|
||||
|
||||
_initialized = false;
|
||||
}
|
||||
|
||||
@@ -63,36 +85,36 @@ namespace WorkIndicator
|
||||
var yellow = StoplightIndicator.LightState.Off;
|
||||
var green = StoplightIndicator.LightState.Off;
|
||||
|
||||
if (_status == Status.Auto)
|
||||
var status = _status;
|
||||
|
||||
if (status == Status.Auto)
|
||||
{
|
||||
if (AudioWatcher.MicrophoneInUse())
|
||||
{
|
||||
red = StoplightIndicator.LightState.On;
|
||||
status = Status.OnPhone;
|
||||
}
|
||||
else
|
||||
{
|
||||
yellow = StoplightIndicator.LightState.On;
|
||||
status = (Status) Enum.Parse(typeof(Status), Properties.Settings.Default.DefaultStatus);
|
||||
}
|
||||
}
|
||||
else
|
||||
|
||||
switch (status)
|
||||
{
|
||||
switch (_status)
|
||||
{
|
||||
case Status.Free:
|
||||
green = StoplightIndicator.LightState.On;
|
||||
break;
|
||||
case Status.Working:
|
||||
yellow = StoplightIndicator.LightState.On;
|
||||
break;
|
||||
case Status.OnPhone:
|
||||
red = StoplightIndicator.LightState.On;
|
||||
break;
|
||||
case Status.Talking:
|
||||
red = StoplightIndicator.LightState.Blink;
|
||||
break;
|
||||
default:
|
||||
throw new ArgumentOutOfRangeException();
|
||||
}
|
||||
case Status.Free:
|
||||
green = StoplightIndicator.LightState.On;
|
||||
break;
|
||||
case Status.Working:
|
||||
yellow = StoplightIndicator.LightState.On;
|
||||
break;
|
||||
case Status.OnPhone:
|
||||
red = StoplightIndicator.LightState.On;
|
||||
break;
|
||||
case Status.Talking:
|
||||
red = StoplightIndicator.LightState.Blink;
|
||||
break;
|
||||
default:
|
||||
throw new ArgumentOutOfRangeException();
|
||||
}
|
||||
|
||||
_stoplightIndicator.SetLights(red, yellow, green);
|
||||
|
||||
@@ -4,21 +4,43 @@
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:windows="clr-namespace:Common.Wpf.Windows;assembly=Common.Wpf"
|
||||
xmlns:properties="clr-namespace:WorkIndicator.Properties"
|
||||
mc:Ignorable="d"
|
||||
d:DesignHeight="300"
|
||||
d:DesignWidth="300">
|
||||
<Grid>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="Auto"></RowDefinition>
|
||||
<RowDefinition Height="Auto"></RowDefinition>
|
||||
<RowDefinition Height="Auto"></RowDefinition>
|
||||
<RowDefinition Height="Auto"></RowDefinition>
|
||||
<RowDefinition Height="*"></RowDefinition>
|
||||
</Grid.RowDefinitions>
|
||||
<TextBlock Text="[Application Name]"
|
||||
Name="ApplicationNameLabel"
|
||||
VerticalAlignment="Top"
|
||||
FontWeight="Bold" />
|
||||
FontWeight="Bold"
|
||||
Grid.Row="0" />
|
||||
<TextBlock Text="[Application Version]"
|
||||
Margin="0,22,0,0"
|
||||
Margin="0,6,0,0"
|
||||
Name="VersionLabel"
|
||||
VerticalAlignment="Top" />
|
||||
VerticalAlignment="Top"
|
||||
Grid.Row="1" />
|
||||
<TextBlock Text="[Company]"
|
||||
Margin="0,44,0,0"
|
||||
Margin="0,6,0,0"
|
||||
Name="CompanyLabel"
|
||||
VerticalAlignment="Top" />
|
||||
VerticalAlignment="Top"
|
||||
Grid.Row="2" />
|
||||
<StackPanel Grid.Row="3"
|
||||
Grid.Column="0"
|
||||
Margin="0,20,0,0"
|
||||
Orientation="Horizontal">
|
||||
<Button Content="{x:Static properties:Resources.CheckUpdate}"
|
||||
HorizontalAlignment="Left"
|
||||
Padding="6,2"
|
||||
Click="HandleCheckForUpdateButtonClick"
|
||||
VerticalContentAlignment="Center" />
|
||||
<Label Name="UpdateMessage" Content="" VerticalContentAlignment="Center" Padding="6,0" />
|
||||
</StackPanel>
|
||||
</Grid>
|
||||
</windows:CategoryPanel>
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
using Common.Update;
|
||||
using System.Reflection;
|
||||
using System.Windows;
|
||||
|
||||
namespace WorkIndicator.Options
|
||||
{
|
||||
@@ -32,5 +33,10 @@ namespace WorkIndicator.Options
|
||||
}
|
||||
|
||||
public override string CategoryName => Properties.Resources.OptionCategory_About;
|
||||
|
||||
private async void HandleCheckForUpdateButtonClick(object sender, RoutedEventArgs e)
|
||||
{
|
||||
await UpdateCheck.CheckUpdate((status, message) => UpdateMessage.Content = message);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -7,8 +7,14 @@
|
||||
xmlns:properties="clr-namespace:WorkIndicator.Properties"
|
||||
mc:Ignorable="d"
|
||||
d:DesignHeight="300"
|
||||
d:DesignWidth="300">
|
||||
d:DesignWidth="300"
|
||||
DataContext="{Binding RelativeSource={RelativeSource Self}}">
|
||||
<Grid>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="Auto"></RowDefinition>
|
||||
<RowDefinition Height="Auto"></RowDefinition>
|
||||
<RowDefinition Height="*"></RowDefinition>
|
||||
</Grid.RowDefinitions>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="Auto" />
|
||||
<ColumnDefinition Width="*" />
|
||||
@@ -18,5 +24,19 @@
|
||||
VerticalAlignment="Top"
|
||||
VerticalContentAlignment="Center"
|
||||
Grid.ColumnSpan="2" />
|
||||
<Label Content="{x:Static properties:Resources.DefaultStatus}"
|
||||
Name="ApplicationNameLabel"
|
||||
VerticalAlignment="Center"
|
||||
Padding="0,0,6,0"
|
||||
Grid.Row="1"
|
||||
Margin="0,20,0,0" />
|
||||
<ComboBox Name="DefaultStatus"
|
||||
Grid.Row="1"
|
||||
Grid.Column="1"
|
||||
Margin="0,20,0,0"
|
||||
ItemsSource="{Binding Path=DefaultStatusList}"
|
||||
DisplayMemberPath="Text"
|
||||
SelectedValuePath="Value">
|
||||
</ComboBox>
|
||||
</Grid>
|
||||
</windows:CategoryPanel>
|
||||
|
||||
@@ -1,10 +1,24 @@
|
||||
using Common.Wpf.Extensions;
|
||||
using System;
|
||||
using Common.Wpf.Extensions;
|
||||
using System.Collections.ObjectModel;
|
||||
using System.Windows;
|
||||
|
||||
namespace WorkIndicator.Options
|
||||
{
|
||||
public partial class GeneralOptionsPanel
|
||||
{
|
||||
public class StatusItem
|
||||
{
|
||||
public Status Value { get; set; }
|
||||
public string Text { get; set; }
|
||||
|
||||
public StatusItem(Status value, string text)
|
||||
{
|
||||
Value = value;
|
||||
Text = text;
|
||||
}
|
||||
}
|
||||
|
||||
public GeneralOptionsPanel()
|
||||
{
|
||||
InitializeComponent();
|
||||
@@ -17,6 +31,8 @@ namespace WorkIndicator.Options
|
||||
var settings = Properties.Settings.Default;
|
||||
|
||||
StartWithWindows.IsChecked = settings.StartWithWindows;
|
||||
|
||||
DefaultStatus.SelectedValue = Enum.Parse(typeof(Status), settings.DefaultStatus);
|
||||
}
|
||||
|
||||
public override bool ValidatePanel()
|
||||
@@ -32,8 +48,18 @@ namespace WorkIndicator.Options
|
||||
settings.StartWithWindows = StartWithWindows.IsChecked.Value;
|
||||
|
||||
Application.Current.SetStartWithWindows(settings.StartWithWindows);
|
||||
|
||||
settings.DefaultStatus = DefaultStatus.SelectedValue.ToString();
|
||||
}
|
||||
|
||||
public override string CategoryName => Properties.Resources.OptionCategory_General;
|
||||
|
||||
public ObservableCollection<StatusItem> DefaultStatusList => new ObservableCollection<StatusItem>
|
||||
{
|
||||
new StatusItem(Status.Free, Properties.Resources.Free),
|
||||
new StatusItem(Status.Working, Properties.Resources.Working),
|
||||
new StatusItem(Status.OnPhone, Properties.Resources.OnPhone),
|
||||
new StatusItem(Status.Talking, Properties.Resources.Talking)
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
18
Properties/Resources.Designer.cs
generated
18
Properties/Resources.Designer.cs
generated
@@ -133,6 +133,15 @@ namespace WorkIndicator.Properties {
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to _Check for Update.
|
||||
/// </summary>
|
||||
public static string CheckUpdate {
|
||||
get {
|
||||
return ResourceManager.GetString("CheckUpdate", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Enabled.
|
||||
/// </summary>
|
||||
@@ -160,6 +169,15 @@ namespace WorkIndicator.Properties {
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to _Default status:.
|
||||
/// </summary>
|
||||
public static string DefaultStatus {
|
||||
get {
|
||||
return ResourceManager.GetString("DefaultStatus", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Delete.
|
||||
/// </summary>
|
||||
|
||||
@@ -241,4 +241,10 @@
|
||||
<data name="Loading" xml:space="preserve">
|
||||
<value>Loading...</value>
|
||||
</data>
|
||||
<data name="CheckUpdate" xml:space="preserve">
|
||||
<value>_Check for Update</value>
|
||||
</data>
|
||||
<data name="DefaultStatus" xml:space="preserve">
|
||||
<value>_Default status:</value>
|
||||
</data>
|
||||
</root>
|
||||
14
Properties/Settings.Designer.cs
generated
14
Properties/Settings.Designer.cs
generated
@@ -12,7 +12,7 @@ namespace WorkIndicator.Properties {
|
||||
|
||||
|
||||
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.5.0.0")]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.0.3.0")]
|
||||
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
|
||||
|
||||
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
|
||||
@@ -64,5 +64,17 @@ namespace WorkIndicator.Properties {
|
||||
this["WindowPatterns"] = value;
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Configuration.UserScopedSettingAttribute()]
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.Configuration.DefaultSettingValueAttribute("Free")]
|
||||
public string DefaultStatus {
|
||||
get {
|
||||
return ((string)(this["DefaultStatus"]));
|
||||
}
|
||||
set {
|
||||
this["DefaultStatus"] = value;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -14,5 +14,8 @@
|
||||
<Setting Name="WindowPatterns" Type="System.String" Scope="User">
|
||||
<Value Profile="(Default)" />
|
||||
</Setting>
|
||||
<Setting Name="DefaultStatus" Type="System.String" Scope="User">
|
||||
<Value Profile="(Default)">Free</Value>
|
||||
</Setting>
|
||||
</Settings>
|
||||
</SettingsFile>
|
||||
@@ -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(200, Resources.ApplicationName, text, ToolTipIcon.None);
|
||||
}
|
||||
|
||||
static void HandleContextMenuStripOpening(object sender, System.ComponentModel.CancelEventArgs e)
|
||||
@@ -136,6 +136,7 @@ namespace WorkIndicator
|
||||
|
||||
if (dialogResult.HasValue && dialogResult.Value)
|
||||
{
|
||||
Settings.Default.Save();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
52
UsbService.cs
Normal file
52
UsbService.cs
Normal file
@@ -0,0 +1,52 @@
|
||||
using System;
|
||||
using System.Windows.Forms;
|
||||
|
||||
namespace WorkIndicator
|
||||
{
|
||||
internal class UsbService : NativeWindow, IDisposable
|
||||
{
|
||||
public event Action DevicesChanged;
|
||||
|
||||
private const int WM_DEVICECHANGE = 0x0219;
|
||||
private const int DBT_DEVICEARRIVAL = 0x8000;
|
||||
private const int DBT_DEVICEREMOVECOMPLETE = 0x8004;
|
||||
private const int DBT_DEVNODES_CHANGED = 0x0007;
|
||||
|
||||
private bool _isDisposed;
|
||||
|
||||
internal UsbService()
|
||||
{
|
||||
base.CreateHandle(new CreateParams());
|
||||
}
|
||||
|
||||
|
||||
protected override void WndProc(ref Message msg)
|
||||
{
|
||||
base.WndProc(ref msg);
|
||||
|
||||
if (msg.Msg == WM_DEVICECHANGE)
|
||||
{
|
||||
switch (msg.WParam.ToInt32())
|
||||
{
|
||||
case DBT_DEVNODES_CHANGED:
|
||||
case DBT_DEVICEARRIVAL:
|
||||
case DBT_DEVICEREMOVECOMPLETE:
|
||||
DevicesChanged?.Invoke();
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void Dispose()
|
||||
{
|
||||
if (!_isDisposed)
|
||||
{
|
||||
base.DestroyHandle();
|
||||
|
||||
_isDisposed = true;
|
||||
|
||||
GC.SuppressFinalize(this);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -144,6 +144,7 @@
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="UpdateCheck.cs" />
|
||||
<Compile Include="UsbService.cs" />
|
||||
<Page Include="App.xaml">
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
<SubType>Designer</SubType>
|
||||
@@ -237,6 +238,12 @@
|
||||
<PackageReference Include="Newtonsoft.Json">
|
||||
<Version>13.0.1</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Serilog">
|
||||
<Version>2.10.0</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Serilog.Sinks.File">
|
||||
<Version>5.0.0</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="squirrel.windows">
|
||||
<Version>2.0.1</Version>
|
||||
</PackageReference>
|
||||
|
||||
@@ -16,6 +16,9 @@
|
||||
<setting name="WindowPatterns" serializeAs="String">
|
||||
<value />
|
||||
</setting>
|
||||
<setting name="DefaultStatus" serializeAs="String">
|
||||
<value>Free</value>
|
||||
</setting>
|
||||
</WorkIndicator.Properties.Settings>
|
||||
</userSettings>
|
||||
<applicationSettings>
|
||||
|
||||
Reference in New Issue
Block a user