Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow enable/disable display of notifications #33

Merged
merged 1 commit into from
Dec 1, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,6 @@ ipch/
*.sdf
Final
GenerateChangelog.bat

# nuget
packages/
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,6 @@ public interface ISoundSwitchConfiguration : IConfiguration
HotKeys RecordingHotKeys { get; set; }
bool ChangeCommunications { get; set; }
uint UpdateCheckInterval { get; set; }
bool DisplayNotifications { get; set; }
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ public SoundSwitchConfiguration()
{
FirstRun = true;
ChangeCommunications = false;
DisplayNotifications = true;
SelectedPlaybackDeviceList = new HashSet<string>();
SelectedRecordingDeviceList = new HashSet<string>();
PlaybackHotKeys = new HotKeys(Keys.F11, HotKeys.ModifierKeys.Alt | HotKeys.ModifierKeys.Control);
Expand All @@ -50,6 +51,8 @@ public HotKeys HotKeysCombinaison
public HotKeys RecordingHotKeys { get; set; }
public bool ChangeCommunications { get; set; }
public uint UpdateCheckInterval { get; set; }
public bool DisplayNotifications { get; set; }

//Needed by Interface
public string FileLocation { get; set; }

Expand Down
10 changes: 10 additions & 0 deletions SoundSwitch/Model/AppModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,16 @@ public bool RunAtStartup
}
}

public bool DisplayNotifications
{
get { return AppConfigs.Configuration.DisplayNotifications; }
set
{
AppConfigs.Configuration.DisplayNotifications = value;
AppConfigs.Configuration.Save();
}
}

public IAudioDeviceLister ActiveAudioDeviceLister { get; set; }

#endregion
Expand Down
6 changes: 6 additions & 0 deletions SoundSwitch/Model/IAppModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,12 @@ public interface IAppModel
/// If the application runs at windows startup
/// </summary>
bool RunAtStartup { get; set; }

/// <summary>
/// If notifications are displayed when the devices are changed
/// </summary>
bool DisplayNotifications { get; set; }

/// <summary>
/// List the active audio devices
/// </summary>
Expand Down
3 changes: 3 additions & 0 deletions SoundSwitch/SoundSwitch.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,9 @@
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>UpdateFormStrings.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Include="UI\Forms\Settings.resx">
<DependentUpon>Settings.cs</DependentUpon>
</EmbeddedResource>
<None Include="App.config" />
<None Include="packages.config" />
</ItemGroup>
Expand Down
37 changes: 26 additions & 11 deletions SoundSwitch/UI/Forms/Settings.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions SoundSwitch/UI/Forms/Settings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ public Settings()

RunAtStartup.Checked = AppModel.Instance.RunAtStartup;
communicationCheckbox.Checked = AppModel.Instance.SetCommunications;
notificationsCheckbox.Checked = AppModel.Instance.DisplayNotifications;

var audioDeviceLister = new AudioDeviceLister(DeviceState.All);
PopulateAudioList(playbackListView, AppModel.Instance.SelectedPlaybackDevicesList,
audioDeviceLister.GetPlaybackDevices());
Expand Down Expand Up @@ -264,5 +266,11 @@ private void tabControl_SelectedIndexChanged(object sender, EventArgs e)
hotkeyTextBox.Tag = AudioDeviceType.Recording;
}
}

private void notificationsCheckbox_CheckedChanged(object sender, EventArgs e)
{
var checkboxSender = (CheckBox) sender;
AppModel.Instance.DisplayNotifications = checkboxSender.Checked;
}
}
}
120 changes: 120 additions & 0 deletions SoundSwitch/UI/Forms/Settings.resx
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema

Version 2.0

The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.

Example:

... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>

There are any number of "resheader" rows that contain simple
name/value pairs.

Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.

The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:

Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.

mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.

mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.

mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>
12 changes: 10 additions & 2 deletions SoundSwitch/Util/TrayIcon.cs
Original file line number Diff line number Diff line change
Expand Up @@ -322,12 +322,20 @@ private void DeviceClicked(object sender, EventArgs e)

private void ShowPlaybackChanged(string deviceName)
{
_trayIcon.ShowBalloonTip(500, string.Format(TrayIconStrings.playbackChanged, Application.ProductName), deviceName, ToolTipIcon.Info);
if (AppModel.Instance.DisplayNotifications)
{
_trayIcon.ShowBalloonTip(500, string.Format(TrayIconStrings.playbackChanged, Application.ProductName),
deviceName, ToolTipIcon.Info);
}
}

private void ShowRecordingChanged(string deviceName)
{
_trayIcon.ShowBalloonTip(500, string.Format(TrayIconStrings.recordingChanged, Application.ProductName), deviceName, ToolTipIcon.Info);
if (AppModel.Instance.DisplayNotifications)
{
_trayIcon.ShowBalloonTip(500, string.Format(TrayIconStrings.recordingChanged, Application.ProductName),
deviceName, ToolTipIcon.Info);
}
}

/// <summary>
Expand Down