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 setting for default status

Browse Source
This commit is contained in:
Chris Kaczor
2021-12-20 17:50:58 -05:00
parent 0c8ec51660
commit 18aae0cef3
8 changed files with 109 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
LightController.cs
View File

@@ -27,17 +27,25 @@ namespace WorkIndicator
_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();
}
@@ -77,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);

22
Options/GeneralOptionsPanel.xaml
View File

@@ -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>

28
Options/GeneralOptionsPanel.xaml.cs
View File

@@ -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)
};
}
}

9
Properties/Resources.Designer.cs generated
View File

@@ -169,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>

3
Properties/Resources.resx
View File

@@ -244,4 +244,7 @@
<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
View File

@@ -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;
}
}
}
}

3
Properties/Settings.settings
View File

@@ -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>

3
app.config
View File

@@ -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>