Merge pull request #17 from mshafer1/dev/toast_notifications_plus
toast notifications(+)
This commit is contained in:
@@ -16,6 +16,7 @@ namespace ntfysh_client
|
|||||||
private readonly NotificationListener _notificationListener;
|
private readonly NotificationListener _notificationListener;
|
||||||
private bool _startInTray;
|
private bool _startInTray;
|
||||||
private bool _trueExit;
|
private bool _trueExit;
|
||||||
|
private NotificationDialog _notificationDialog;
|
||||||
|
|
||||||
public MainForm(NotificationListener notificationListener, bool startInTray = false)
|
public MainForm(NotificationListener notificationListener, bool startInTray = false)
|
||||||
{
|
{
|
||||||
@@ -32,6 +33,8 @@ namespace ntfysh_client
|
|||||||
{
|
{
|
||||||
LoadSettings();
|
LoadSettings();
|
||||||
LoadTopics();
|
LoadTopics();
|
||||||
|
|
||||||
|
_notificationDialog = new NotificationDialog();
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override void SetVisibleCore(bool value)
|
protected override void SetVisibleCore(bool value)
|
||||||
@@ -70,8 +73,24 @@ namespace ntfysh_client
|
|||||||
|
|
||||||
string finalTitle = string.IsNullOrWhiteSpace(e.Title) ? $"{e.Sender.TopicId}@{e.Sender.ServerUrl}" : e.Title;
|
string finalTitle = string.IsNullOrWhiteSpace(e.Title) ? $"{e.Sender.TopicId}@{e.Sender.ServerUrl}" : e.Title;
|
||||||
|
|
||||||
|
if (Program.Settings.NotificationsMethod == SettingsModel.NotificationsType.NativeWindows)
|
||||||
|
{
|
||||||
notifyIcon.ShowBalloonTip((int)TimeSpan.FromSeconds((double)Program.Settings.Timeout).TotalMilliseconds, finalTitle, e.Message, priorityIcon);
|
notifyIcon.ShowBalloonTip((int)TimeSpan.FromSeconds((double)Program.Settings.Timeout).TotalMilliseconds, finalTitle, e.Message, priorityIcon);
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
|
||||||
|
_notificationDialog.ShowNotification(
|
||||||
|
title: finalTitle,
|
||||||
|
message: e.Message,
|
||||||
|
timeoutSeconds: (int)Program.Settings.Timeout,
|
||||||
|
icon: priorityIcon,
|
||||||
|
showTimeOutBar: Program.Settings.CustomTrayNotificationsShowTimeoutBar,
|
||||||
|
showInDarkMode: Program.Settings.CustomTrayNotificationsShowInDarkMode,
|
||||||
|
playNotificationSound: Program.Settings.CustomTrayNotificationsPlayDefaultWindowsSound
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private void OnConnectionMultiAttemptFailure(NotificationListener sender, SubscribedTopic topic)
|
private void OnConnectionMultiAttemptFailure(NotificationListener sender, SubscribedTopic topic)
|
||||||
{
|
{
|
||||||
@@ -132,9 +151,14 @@ namespace ntfysh_client
|
|||||||
using SettingsDialog dialog = new();
|
using SettingsDialog dialog = new();
|
||||||
|
|
||||||
//Load current settings into dialog
|
//Load current settings into dialog
|
||||||
dialog.Timeout = Program.Settings.Timeout;
|
|
||||||
dialog.ReconnectAttempts = Program.Settings.ReconnectAttempts;
|
dialog.ReconnectAttempts = Program.Settings.ReconnectAttempts;
|
||||||
dialog.ReconnectAttemptDelay = Program.Settings.ReconnectAttemptDelay;
|
dialog.ReconnectAttemptDelay = Program.Settings.ReconnectAttemptDelay;
|
||||||
|
dialog.UseNativeWindowsNotifications = Program.Settings.NotificationsMethod == SettingsModel.NotificationsType.NativeWindows;
|
||||||
|
dialog.UseCustomTrayNotifications = Program.Settings.NotificationsMethod == SettingsModel.NotificationsType.CustomTray;
|
||||||
|
dialog.CustomTrayNotificationsShowTimeoutBar = Program.Settings.CustomTrayNotificationsShowTimeoutBar;
|
||||||
|
dialog.CustomTrayNotificationsShowInDarkMode = Program.Settings.CustomTrayNotificationsShowInDarkMode;
|
||||||
|
dialog.CustomTrayNotificationsPlayDefaultWindowsSound = Program.Settings.CustomTrayNotificationsPlayDefaultWindowsSound;
|
||||||
|
dialog.Timeout = Program.Settings.Timeout; // set timeout last so bounds are setup before setting value
|
||||||
|
|
||||||
//Show dialog
|
//Show dialog
|
||||||
DialogResult result = dialog.ShowDialog();
|
DialogResult result = dialog.ShowDialog();
|
||||||
@@ -146,6 +170,10 @@ namespace ntfysh_client
|
|||||||
Program.Settings.Timeout = dialog.Timeout;
|
Program.Settings.Timeout = dialog.Timeout;
|
||||||
Program.Settings.ReconnectAttempts = dialog.ReconnectAttempts;
|
Program.Settings.ReconnectAttempts = dialog.ReconnectAttempts;
|
||||||
Program.Settings.ReconnectAttemptDelay = dialog.ReconnectAttemptDelay;
|
Program.Settings.ReconnectAttemptDelay = dialog.ReconnectAttemptDelay;
|
||||||
|
Program.Settings.NotificationsMethod = (dialog.UseNativeWindowsNotifications)? SettingsModel.NotificationsType.NativeWindows : SettingsModel.NotificationsType.CustomTray;
|
||||||
|
Program.Settings.CustomTrayNotificationsShowTimeoutBar = dialog.CustomTrayNotificationsShowTimeoutBar;
|
||||||
|
Program.Settings.CustomTrayNotificationsShowInDarkMode = dialog.CustomTrayNotificationsShowInDarkMode;
|
||||||
|
Program.Settings.CustomTrayNotificationsPlayDefaultWindowsSound = dialog.CustomTrayNotificationsPlayDefaultWindowsSound;
|
||||||
|
|
||||||
//Save new settings persistently
|
//Save new settings persistently
|
||||||
SaveSettingsToFile();
|
SaveSettingsToFile();
|
||||||
@@ -298,10 +326,14 @@ namespace ntfysh_client
|
|||||||
|
|
||||||
private SettingsModel GetDefaultSettings() => new()
|
private SettingsModel GetDefaultSettings() => new()
|
||||||
{
|
{
|
||||||
Revision = 1,
|
Revision = 2,
|
||||||
Timeout = 5,
|
Timeout = 5,
|
||||||
ReconnectAttempts = 10,
|
ReconnectAttempts = 10,
|
||||||
ReconnectAttemptDelay = 3
|
ReconnectAttemptDelay = 3,
|
||||||
|
NotificationsMethod = SettingsModel.NotificationsType.NativeWindows,
|
||||||
|
CustomTrayNotificationsShowTimeoutBar = true,
|
||||||
|
CustomTrayNotificationsShowInDarkMode = false,
|
||||||
|
CustomTrayNotificationsPlayDefaultWindowsSound = true,
|
||||||
};
|
};
|
||||||
|
|
||||||
private void MergeSettingsRevisions(SettingsModel older, SettingsModel newer)
|
private void MergeSettingsRevisions(SettingsModel older, SettingsModel newer)
|
||||||
@@ -313,6 +345,15 @@ namespace ntfysh_client
|
|||||||
older.ReconnectAttemptDelay = newer.ReconnectAttemptDelay;
|
older.ReconnectAttemptDelay = newer.ReconnectAttemptDelay;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//Apply settings introduced in Revision 2 (Native vs custom notifications)
|
||||||
|
if (older.Revision < 2)
|
||||||
|
{
|
||||||
|
older.NotificationsMethod = newer.NotificationsMethod;
|
||||||
|
older.CustomTrayNotificationsShowTimeoutBar = newer.CustomTrayNotificationsShowTimeoutBar;
|
||||||
|
older.CustomTrayNotificationsShowInDarkMode = newer.CustomTrayNotificationsShowInDarkMode;
|
||||||
|
older.CustomTrayNotificationsPlayDefaultWindowsSound = newer.CustomTrayNotificationsPlayDefaultWindowsSound;
|
||||||
|
}
|
||||||
|
|
||||||
//Update the revision
|
//Update the revision
|
||||||
older.Revision = newer.Revision;
|
older.Revision = newer.Revision;
|
||||||
}
|
}
|
||||||
@@ -361,7 +402,7 @@ namespace ntfysh_client
|
|||||||
Program.Settings = settings;
|
Program.Settings = settings;
|
||||||
|
|
||||||
//Check the settings revision. If it is older than the current latest revision, apply the settings defaults missing from previous revision
|
//Check the settings revision. If it is older than the current latest revision, apply the settings defaults missing from previous revision
|
||||||
if (Program.Settings.Revision < defaultSettings.ReconnectAttempts)
|
if (Program.Settings.Revision < defaultSettings.Revision)
|
||||||
{
|
{
|
||||||
MergeSettingsRevisions(Program.Settings, defaultSettings);
|
MergeSettingsRevisions(Program.Settings, defaultSettings);
|
||||||
SaveSettingsToFile();
|
SaveSettingsToFile();
|
||||||
|
146
ntfysh_client/NotificationDialog.Designer.cs
generated
Normal file
146
ntfysh_client/NotificationDialog.Designer.cs
generated
Normal file
@@ -0,0 +1,146 @@
|
|||||||
|
namespace ntfysh_client
|
||||||
|
{
|
||||||
|
partial class NotificationDialog
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Required designer variable.
|
||||||
|
/// </summary>
|
||||||
|
private System.ComponentModel.IContainer components = null;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Clean up any resources being used.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
|
||||||
|
protected override void Dispose(bool disposing)
|
||||||
|
{
|
||||||
|
if (disposing && (components != null))
|
||||||
|
{
|
||||||
|
components.Dispose();
|
||||||
|
}
|
||||||
|
base.Dispose(disposing);
|
||||||
|
}
|
||||||
|
|
||||||
|
#region Windows Form Designer generated code
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Required method for Designer support - do not modify
|
||||||
|
/// the contents of this method with the code editor.
|
||||||
|
/// </summary>
|
||||||
|
private void InitializeComponent()
|
||||||
|
{
|
||||||
|
TxBTitle = new System.Windows.Forms.TextBox();
|
||||||
|
ButtonClose = new System.Windows.Forms.Button();
|
||||||
|
TxBMessage = new System.Windows.Forms.RichTextBox();
|
||||||
|
IconBox = new System.Windows.Forms.PictureBox();
|
||||||
|
ProgressBar1 = new System.Windows.Forms.ProgressBar();
|
||||||
|
LblTimeout = new System.Windows.Forms.Label();
|
||||||
|
((System.ComponentModel.ISupportInitialize)IconBox).BeginInit();
|
||||||
|
SuspendLayout();
|
||||||
|
//
|
||||||
|
// TxBTitle
|
||||||
|
//
|
||||||
|
TxBTitle.BackColor = System.Drawing.SystemColors.ControlDark;
|
||||||
|
TxBTitle.BorderStyle = System.Windows.Forms.BorderStyle.None;
|
||||||
|
TxBTitle.Font = new System.Drawing.Font("Segoe UI", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
|
||||||
|
TxBTitle.ForeColor = System.Drawing.SystemColors.ControlLightLight;
|
||||||
|
TxBTitle.Location = new System.Drawing.Point(54, 13);
|
||||||
|
TxBTitle.Name = "TxBTitle";
|
||||||
|
TxBTitle.ReadOnly = true;
|
||||||
|
TxBTitle.Size = new System.Drawing.Size(683, 32);
|
||||||
|
TxBTitle.TabIndex = 0;
|
||||||
|
TxBTitle.MouseDown += window_MouseDown;
|
||||||
|
//
|
||||||
|
// ButtonClose
|
||||||
|
//
|
||||||
|
ButtonClose.BackColor = System.Drawing.SystemColors.ActiveCaptionText;
|
||||||
|
ButtonClose.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
|
||||||
|
ButtonClose.FlatAppearance.BorderSize = 0;
|
||||||
|
ButtonClose.FlatAppearance.MouseOverBackColor = System.Drawing.Color.DimGray;
|
||||||
|
ButtonClose.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
|
||||||
|
ButtonClose.ForeColor = System.Drawing.SystemColors.ButtonFace;
|
||||||
|
ButtonClose.Location = new System.Drawing.Point(759, 7);
|
||||||
|
ButtonClose.Name = "ButtonClose";
|
||||||
|
ButtonClose.Size = new System.Drawing.Size(29, 38);
|
||||||
|
ButtonClose.TabIndex = 1;
|
||||||
|
ButtonClose.Text = "X";
|
||||||
|
ButtonClose.UseVisualStyleBackColor = false;
|
||||||
|
ButtonClose.Click += ButtonClose_ClickHandler;
|
||||||
|
//
|
||||||
|
// TxBMessage
|
||||||
|
//
|
||||||
|
TxBMessage.BackColor = System.Drawing.SystemColors.ControlDark;
|
||||||
|
TxBMessage.BorderStyle = System.Windows.Forms.BorderStyle.None;
|
||||||
|
TxBMessage.Font = new System.Drawing.Font("Segoe UI", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
|
||||||
|
TxBMessage.ForeColor = System.Drawing.SystemColors.ControlLightLight;
|
||||||
|
TxBMessage.Location = new System.Drawing.Point(12, 57);
|
||||||
|
TxBMessage.Name = "TxBMessage";
|
||||||
|
TxBMessage.ReadOnly = true;
|
||||||
|
TxBMessage.Size = new System.Drawing.Size(776, 191);
|
||||||
|
TxBMessage.TabIndex = 2;
|
||||||
|
TxBMessage.Text = "";
|
||||||
|
TxBMessage.MouseDown += window_MouseDown;
|
||||||
|
//
|
||||||
|
// IconBox
|
||||||
|
//
|
||||||
|
IconBox.Location = new System.Drawing.Point(12, 12);
|
||||||
|
IconBox.Name = "IconBox";
|
||||||
|
IconBox.Size = new System.Drawing.Size(36, 39);
|
||||||
|
IconBox.TabIndex = 3;
|
||||||
|
IconBox.TabStop = false;
|
||||||
|
//
|
||||||
|
// ProgressBar1
|
||||||
|
//
|
||||||
|
ProgressBar1.BackColor = System.Drawing.SystemColors.ControlDarkDark;
|
||||||
|
ProgressBar1.Enabled = false;
|
||||||
|
ProgressBar1.ForeColor = System.Drawing.SystemColors.WindowFrame;
|
||||||
|
ProgressBar1.Location = new System.Drawing.Point(70, 254);
|
||||||
|
ProgressBar1.MarqueeAnimationSpeed = 1;
|
||||||
|
ProgressBar1.Name = "ProgressBar1";
|
||||||
|
ProgressBar1.Size = new System.Drawing.Size(718, 23);
|
||||||
|
ProgressBar1.Step = 1;
|
||||||
|
ProgressBar1.Style = System.Windows.Forms.ProgressBarStyle.Continuous;
|
||||||
|
ProgressBar1.TabIndex = 4;
|
||||||
|
ProgressBar1.Value = 100;
|
||||||
|
//
|
||||||
|
// LblTimeout
|
||||||
|
//
|
||||||
|
LblTimeout.AutoSize = true;
|
||||||
|
LblTimeout.Font = new System.Drawing.Font("Segoe UI", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
|
||||||
|
LblTimeout.Location = new System.Drawing.Point(21, 254);
|
||||||
|
LblTimeout.Name = "LblTimeout";
|
||||||
|
LblTimeout.Size = new System.Drawing.Size(43, 17);
|
||||||
|
LblTimeout.TabIndex = 5;
|
||||||
|
LblTimeout.Text = "label1";
|
||||||
|
LblTimeout.TextAlign = System.Drawing.ContentAlignment.TopRight;
|
||||||
|
//
|
||||||
|
// NotificationDialog
|
||||||
|
//
|
||||||
|
AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
|
||||||
|
AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
||||||
|
BackColor = System.Drawing.SystemColors.ControlDark;
|
||||||
|
ClientSize = new System.Drawing.Size(800, 289);
|
||||||
|
Controls.Add(LblTimeout);
|
||||||
|
Controls.Add(ProgressBar1);
|
||||||
|
Controls.Add(IconBox);
|
||||||
|
Controls.Add(TxBMessage);
|
||||||
|
Controls.Add(ButtonClose);
|
||||||
|
Controls.Add(TxBTitle);
|
||||||
|
FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
|
||||||
|
Name = "NotificationDialog";
|
||||||
|
Text = "NotificationDialog";
|
||||||
|
Click += window_MouseDown;
|
||||||
|
((System.ComponentModel.ISupportInitialize)IconBox).EndInit();
|
||||||
|
ResumeLayout(false);
|
||||||
|
PerformLayout();
|
||||||
|
}
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
private System.Windows.Forms.TextBox TxBTitle;
|
||||||
|
private System.Windows.Forms.Button ButtonClose;
|
||||||
|
private System.Windows.Forms.RichTextBox TxBMessage;
|
||||||
|
private System.Windows.Forms.PictureBox IconBox;
|
||||||
|
private System.Windows.Forms.ProgressBar ProgressBar1;
|
||||||
|
private System.Windows.Forms.Label LblTimeout;
|
||||||
|
}
|
||||||
|
}
|
295
ntfysh_client/NotificationDialog.cs
Normal file
295
ntfysh_client/NotificationDialog.cs
Normal file
@@ -0,0 +1,295 @@
|
|||||||
|
using System;
|
||||||
|
using System.Drawing;
|
||||||
|
using System.Runtime.InteropServices;
|
||||||
|
using System.Windows.Forms;
|
||||||
|
using System.Diagnostics;
|
||||||
|
using ntfysh_client.Themes;
|
||||||
|
using Microsoft.Win32;
|
||||||
|
using System.Media;
|
||||||
|
|
||||||
|
|
||||||
|
namespace ntfysh_client
|
||||||
|
{
|
||||||
|
public partial class NotificationDialog : Form
|
||||||
|
{
|
||||||
|
[DllImport("user32.dll", CharSet = CharSet.Auto)]
|
||||||
|
private static extern bool AnimateWindow(IntPtr hWnd, int time, int flags);
|
||||||
|
|
||||||
|
private const int ScreenMargin = 20;
|
||||||
|
|
||||||
|
private int _timeoutSeconds = 0;
|
||||||
|
private System.Timers.Timer? _displayTimeoutTimer = null;
|
||||||
|
private System.Windows.Forms.Timer? _updateTimer = null;
|
||||||
|
private Stopwatch? _shownStopwatch = null;
|
||||||
|
|
||||||
|
private readonly BaseTheme _darkModeTheme = new DarkModeTheme();
|
||||||
|
private readonly BaseTheme _defaultTheme = new DefaultTheme();
|
||||||
|
private BaseTheme? _theme = null;
|
||||||
|
|
||||||
|
public NotificationDialog()
|
||||||
|
{
|
||||||
|
ShowInTaskbar = false;
|
||||||
|
Visible = false;
|
||||||
|
TopMost = true;
|
||||||
|
InitializeComponent();
|
||||||
|
InitializeWindowHidden();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void ShowNotification(string title, string message, int timeoutSeconds = 0, ToolTipIcon? icon = null, bool showTimeOutBar = true, bool showInDarkMode = true, bool playNotificationSound = false)
|
||||||
|
{
|
||||||
|
if (Visible)
|
||||||
|
{
|
||||||
|
// close the current notification
|
||||||
|
HandleTimeout(null, null);
|
||||||
|
}
|
||||||
|
|
||||||
|
_theme = showInDarkMode ? _darkModeTheme : _defaultTheme;
|
||||||
|
|
||||||
|
ApplyTheme();
|
||||||
|
|
||||||
|
// setup data
|
||||||
|
IconBox.Image = (icon is null) ? null : ConvertToolTipIconToImage(icon.Value);
|
||||||
|
|
||||||
|
TxBTitle.Text = title;
|
||||||
|
TxBMessage.Text = message;
|
||||||
|
|
||||||
|
// setup timers
|
||||||
|
if (_displayTimeoutTimer != null)
|
||||||
|
{
|
||||||
|
_displayTimeoutTimer.Stop();
|
||||||
|
_displayTimeoutTimer.Dispose();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (_updateTimer != null)
|
||||||
|
{
|
||||||
|
_updateTimer.Stop();
|
||||||
|
_updateTimer.Dispose();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (timeoutSeconds > 0)
|
||||||
|
{
|
||||||
|
_displayTimeoutTimer = new System.Timers.Timer(timeoutSeconds * 1000);
|
||||||
|
_displayTimeoutTimer.Elapsed += HandleTimeout;
|
||||||
|
_displayTimeoutTimer.Start();
|
||||||
|
|
||||||
|
if (showTimeOutBar)
|
||||||
|
{
|
||||||
|
ProgressBar1.Value = 100;
|
||||||
|
_updateTimer = new System.Windows.Forms.Timer();
|
||||||
|
_updateTimer.Interval = 100;
|
||||||
|
_updateTimer.Tick += UpdateProgress;
|
||||||
|
_updateTimer.Start();
|
||||||
|
|
||||||
|
_shownStopwatch = new Stopwatch();
|
||||||
|
_shownStopwatch.Start();
|
||||||
|
|
||||||
|
ProgressBar1.Visible = true;
|
||||||
|
LblTimeout.Visible = true;
|
||||||
|
_timeoutSeconds = timeoutSeconds;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
ProgressBar1.Visible = false;
|
||||||
|
LblTimeout.Visible = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
ProgressBar1.Visible = false;
|
||||||
|
LblTimeout.Visible = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// ok, show the window
|
||||||
|
Show();
|
||||||
|
ButtonClose.Focus(); // make sure the window is focused, not the title box.
|
||||||
|
SetWindowPosition();
|
||||||
|
|
||||||
|
if (playNotificationSound) PlayNotificationSound();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void ApplyTheme()
|
||||||
|
{
|
||||||
|
_theme ??= _defaultTheme;
|
||||||
|
|
||||||
|
// back colors
|
||||||
|
BackColor = _theme.BackgroundColor;
|
||||||
|
TxBTitle.BackColor = _theme.BackgroundColor;
|
||||||
|
TxBMessage.BackColor = _theme.BackgroundColor;
|
||||||
|
LblTimeout.BackColor = _theme.BackgroundColor;
|
||||||
|
ProgressBar1.BackColor = _theme.BackgroundColor;
|
||||||
|
|
||||||
|
// this one is not "hiding"
|
||||||
|
ButtonClose.BackColor = _theme.ControlBackGroundColor;
|
||||||
|
ButtonClose.ForeColor = _theme.BackgroundColor;
|
||||||
|
// handle mouse over
|
||||||
|
ButtonClose.FlatAppearance.MouseOverBackColor = _theme.ControlMouseOverBackgroundColor;
|
||||||
|
|
||||||
|
// fore colors
|
||||||
|
ForeColor = _theme.ForegroundColor;
|
||||||
|
TxBTitle.ForeColor = _theme.ForegroundColor;
|
||||||
|
TxBMessage.ForeColor = _theme.ForegroundColor;
|
||||||
|
LblTimeout.ForeColor = _theme.ForegroundColor;
|
||||||
|
ProgressBar1.ForeColor = _theme.ForegroundColor;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void UpdateProgress(object? sender, EventArgs e)
|
||||||
|
{
|
||||||
|
if (_shownStopwatch is null) return;
|
||||||
|
|
||||||
|
ProgressBar1.Value = (_timeoutSeconds - _shownStopwatch.Elapsed.Seconds) * 100 / _timeoutSeconds;
|
||||||
|
LblTimeout.Text = $@"{_timeoutSeconds - _shownStopwatch.Elapsed.Seconds}";
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override void SetVisibleCore(bool value)
|
||||||
|
{
|
||||||
|
SetWindowPosition();
|
||||||
|
|
||||||
|
if (value)
|
||||||
|
{
|
||||||
|
BringToFront();
|
||||||
|
|
||||||
|
AnimateWindow(
|
||||||
|
Handle,
|
||||||
|
time: 250,
|
||||||
|
flags: NFWinUserAnimateWindowConstants.AW_SLIDE | NFWinUserAnimateWindowConstants.AW_VER_NEGATIVE
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
base.SetVisibleCore(value);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void SetWindowPosition()
|
||||||
|
{
|
||||||
|
var workingTop = Screen.PrimaryScreen.WorkingArea.Height - Height;
|
||||||
|
Top = workingTop - NotificationDialog.ScreenMargin;
|
||||||
|
|
||||||
|
var workingLeft = Screen.PrimaryScreen.WorkingArea.Width - Width;
|
||||||
|
Left = workingLeft - NotificationDialog.ScreenMargin;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void UIThreadAnimatedHideWindow(object? sender, EventArgs? e)
|
||||||
|
{
|
||||||
|
|
||||||
|
AnimateWindow(
|
||||||
|
Handle,
|
||||||
|
time: 250,
|
||||||
|
flags: NFWinUserAnimateWindowConstants.AW_SLIDE | NFWinUserAnimateWindowConstants.AW_VER_POSITIVE | NFWinUserAnimateWindowConstants.AW_HIDE
|
||||||
|
);
|
||||||
|
|
||||||
|
Visible = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void HandleTimeout(object? sender, EventArgs? e)
|
||||||
|
{
|
||||||
|
CancelTimer();
|
||||||
|
|
||||||
|
if (InvokeRequired)
|
||||||
|
{
|
||||||
|
// on a background thread, so invoke on the UI thread
|
||||||
|
Invoke(new Action(() => UIThreadAnimatedHideWindow(sender, e)));
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// in the UI thread, invoke directly
|
||||||
|
UIThreadAnimatedHideWindow(sender, e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private Image? ConvertToolTipIconToImage(ToolTipIcon icon) => icon switch
|
||||||
|
{
|
||||||
|
ToolTipIcon.Info => SystemIcons.Information.ToBitmap(),
|
||||||
|
ToolTipIcon.Warning => SystemIcons.Warning.ToBitmap(),
|
||||||
|
ToolTipIcon.Error => SystemIcons.Error.ToBitmap(),
|
||||||
|
_ => null
|
||||||
|
};
|
||||||
|
|
||||||
|
private void InitializeWindowHidden()
|
||||||
|
{
|
||||||
|
Opacity = 0;
|
||||||
|
ShowNotification("Title", "Message");
|
||||||
|
ButtonClose.Focus();
|
||||||
|
Visible = false;
|
||||||
|
Opacity = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void ButtonClose_ClickHandler(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
// don't animate, immediately "close"
|
||||||
|
Visible = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
private class NFWinUserAnimateWindowConstants
|
||||||
|
{
|
||||||
|
public const int AW_HOR_POSITIVE = 0x00000001;
|
||||||
|
public const int AW_HOR_NEGATIVE = 0x00000002;
|
||||||
|
public const int AW_VER_POSITIVE = 0x00000004;
|
||||||
|
public const int AW_VER_NEGATIVE = 0x00000008;
|
||||||
|
public const int AW_CENTER = 0x00000010;
|
||||||
|
public const int AW_HIDE = 0x00010000;
|
||||||
|
public const int AW_ACTIVATE = 0x00020000;
|
||||||
|
public const int AW_SLIDE = 0x00040000;
|
||||||
|
public const int AW_BLEND = 0x00080000;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void window_MouseDown(object sender, EventArgs e) => CancelTimer();
|
||||||
|
|
||||||
|
private void CancelTimer()
|
||||||
|
{
|
||||||
|
if (InvokeRequired)
|
||||||
|
{
|
||||||
|
// on a background thread, so invoke on the UI thread
|
||||||
|
Invoke(new Action(() =>
|
||||||
|
{
|
||||||
|
LblTimeout.Visible = false;
|
||||||
|
ProgressBar1.Visible = false;
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// in the UI thread, invoke directly
|
||||||
|
LblTimeout.Visible = false;
|
||||||
|
ProgressBar1.Visible = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (_displayTimeoutTimer != null) // check if the timer has already been disposed
|
||||||
|
{
|
||||||
|
_displayTimeoutTimer.Stop();
|
||||||
|
_displayTimeoutTimer.Dispose();
|
||||||
|
_displayTimeoutTimer = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (_updateTimer != null)
|
||||||
|
{
|
||||||
|
_updateTimer.Stop();
|
||||||
|
_updateTimer.Dispose();
|
||||||
|
_updateTimer = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (_shownStopwatch != null)
|
||||||
|
{
|
||||||
|
_shownStopwatch.Stop();
|
||||||
|
_shownStopwatch = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void PlayNotificationSound()
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
using RegistryKey? defaultSoundPathKey = Registry.CurrentUser.OpenSubKey(@"AppEvents\Schemes\Apps\.Default\Notification.Default\.Current");
|
||||||
|
|
||||||
|
if (defaultSoundPathKey is null) throw new Exception();
|
||||||
|
|
||||||
|
if (defaultSoundPathKey.GetValue(null) is not string defaultSoundPath) throw new Exception();
|
||||||
|
|
||||||
|
SoundPlayer loadedSound = new(defaultSoundPath);
|
||||||
|
|
||||||
|
loadedSound.Play();
|
||||||
|
}
|
||||||
|
catch
|
||||||
|
{
|
||||||
|
SystemSounds.Beep.Play(); // consolation prize
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
120
ntfysh_client/NotificationDialog.resx
Normal file
120
ntfysh_client/NotificationDialog.resx
Normal file
@@ -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>
|
120
ntfysh_client/SettingsDialog.Designer.cs
generated
120
ntfysh_client/SettingsDialog.Designer.cs
generated
@@ -38,10 +38,20 @@ namespace ntfysh_client
|
|||||||
reconnectAttemptsLabel = new System.Windows.Forms.Label();
|
reconnectAttemptsLabel = new System.Windows.Forms.Label();
|
||||||
reconnectAttemptDelay = new System.Windows.Forms.NumericUpDown();
|
reconnectAttemptDelay = new System.Windows.Forms.NumericUpDown();
|
||||||
reconnectAttemptDelayLabel = new System.Windows.Forms.Label();
|
reconnectAttemptDelayLabel = new System.Windows.Forms.Label();
|
||||||
|
nativeVersusCustomNotificationsGroupBox = new System.Windows.Forms.GroupBox();
|
||||||
|
useCustomTrayNotifications = new System.Windows.Forms.RadioButton();
|
||||||
|
useNativeWindowsNotifications = new System.Windows.Forms.RadioButton();
|
||||||
|
groupCustomNotificationSettings = new System.Windows.Forms.GroupBox();
|
||||||
|
customNotificationsPlayWindowsNotificationAudio = new System.Windows.Forms.CheckBox();
|
||||||
|
customNotificationsShowInDarkMode = new System.Windows.Forms.CheckBox();
|
||||||
|
customNotificationsShowTimeoutBar = new System.Windows.Forms.CheckBox();
|
||||||
|
label1 = new System.Windows.Forms.Label();
|
||||||
buttonPanel.SuspendLayout();
|
buttonPanel.SuspendLayout();
|
||||||
((System.ComponentModel.ISupportInitialize)timeout).BeginInit();
|
((System.ComponentModel.ISupportInitialize)timeout).BeginInit();
|
||||||
((System.ComponentModel.ISupportInitialize)reconnectAttempts).BeginInit();
|
((System.ComponentModel.ISupportInitialize)reconnectAttempts).BeginInit();
|
||||||
((System.ComponentModel.ISupportInitialize)reconnectAttemptDelay).BeginInit();
|
((System.ComponentModel.ISupportInitialize)reconnectAttemptDelay).BeginInit();
|
||||||
|
nativeVersusCustomNotificationsGroupBox.SuspendLayout();
|
||||||
|
groupCustomNotificationSettings.SuspendLayout();
|
||||||
SuspendLayout();
|
SuspendLayout();
|
||||||
//
|
//
|
||||||
// buttonPanel
|
// buttonPanel
|
||||||
@@ -50,7 +60,7 @@ namespace ntfysh_client
|
|||||||
buttonPanel.Controls.Add(cancelButton);
|
buttonPanel.Controls.Add(cancelButton);
|
||||||
buttonPanel.Controls.Add(saveButton);
|
buttonPanel.Controls.Add(saveButton);
|
||||||
buttonPanel.Dock = System.Windows.Forms.DockStyle.Bottom;
|
buttonPanel.Dock = System.Windows.Forms.DockStyle.Bottom;
|
||||||
buttonPanel.Location = new System.Drawing.Point(0, 150);
|
buttonPanel.Location = new System.Drawing.Point(0, 336);
|
||||||
buttonPanel.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
|
buttonPanel.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
|
||||||
buttonPanel.Name = "buttonPanel";
|
buttonPanel.Name = "buttonPanel";
|
||||||
buttonPanel.Size = new System.Drawing.Size(531, 51);
|
buttonPanel.Size = new System.Drawing.Size(531, 51);
|
||||||
@@ -82,9 +92,9 @@ namespace ntfysh_client
|
|||||||
timeoutLabel.Location = new System.Drawing.Point(13, 9);
|
timeoutLabel.Location = new System.Drawing.Point(13, 9);
|
||||||
timeoutLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
|
timeoutLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
|
||||||
timeoutLabel.Name = "timeoutLabel";
|
timeoutLabel.Name = "timeoutLabel";
|
||||||
timeoutLabel.Size = new System.Drawing.Size(488, 15);
|
timeoutLabel.Size = new System.Drawing.Size(401, 15);
|
||||||
timeoutLabel.TabIndex = 3;
|
timeoutLabel.TabIndex = 3;
|
||||||
timeoutLabel.Text = "Notification Toast Timeout (seconds, may be ignored by OS based on accessibility settings):";
|
timeoutLabel.Text = "Notification Toast Timeout (seconds, use -1 to require closing notification):";
|
||||||
//
|
//
|
||||||
// timeout
|
// timeout
|
||||||
//
|
//
|
||||||
@@ -108,7 +118,7 @@ namespace ntfysh_client
|
|||||||
reconnectAttemptsLabel.Location = new System.Drawing.Point(12, 54);
|
reconnectAttemptsLabel.Location = new System.Drawing.Point(12, 54);
|
||||||
reconnectAttemptsLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
|
reconnectAttemptsLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
|
||||||
reconnectAttemptsLabel.Name = "reconnectAttemptsLabel";
|
reconnectAttemptsLabel.Name = "reconnectAttemptsLabel";
|
||||||
reconnectAttemptsLabel.Size = new System.Drawing.Size(198, 15);
|
reconnectAttemptsLabel.Size = new System.Drawing.Size(287, 15);
|
||||||
reconnectAttemptsLabel.TabIndex = 5;
|
reconnectAttemptsLabel.TabIndex = 5;
|
||||||
reconnectAttemptsLabel.Text = "Maximum reconnect retry attempts (requires restart):";
|
reconnectAttemptsLabel.Text = "Maximum reconnect retry attempts (requires restart):";
|
||||||
//
|
//
|
||||||
@@ -126,16 +136,102 @@ namespace ntfysh_client
|
|||||||
reconnectAttemptDelayLabel.Location = new System.Drawing.Point(12, 99);
|
reconnectAttemptDelayLabel.Location = new System.Drawing.Point(12, 99);
|
||||||
reconnectAttemptDelayLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
|
reconnectAttemptDelayLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
|
||||||
reconnectAttemptDelayLabel.Name = "reconnectAttemptDelayLabel";
|
reconnectAttemptDelayLabel.Name = "reconnectAttemptDelayLabel";
|
||||||
reconnectAttemptDelayLabel.Size = new System.Drawing.Size(191, 15);
|
reconnectAttemptDelayLabel.Size = new System.Drawing.Size(275, 15);
|
||||||
reconnectAttemptDelayLabel.TabIndex = 7;
|
reconnectAttemptDelayLabel.TabIndex = 7;
|
||||||
reconnectAttemptDelayLabel.Text = "Delay between attempts (seconds, requires restart):";
|
reconnectAttemptDelayLabel.Text = "Delay between attempts (seconds, requires restart):";
|
||||||
//
|
//
|
||||||
|
// nativeVersusCustomNotificationsGroupBox
|
||||||
|
//
|
||||||
|
nativeVersusCustomNotificationsGroupBox.Controls.Add(useCustomTrayNotifications);
|
||||||
|
nativeVersusCustomNotificationsGroupBox.Controls.Add(useNativeWindowsNotifications);
|
||||||
|
nativeVersusCustomNotificationsGroupBox.Location = new System.Drawing.Point(12, 147);
|
||||||
|
nativeVersusCustomNotificationsGroupBox.Name = "nativeVersusCustomNotificationsGroupBox";
|
||||||
|
nativeVersusCustomNotificationsGroupBox.Size = new System.Drawing.Size(506, 67);
|
||||||
|
nativeVersusCustomNotificationsGroupBox.TabIndex = 9;
|
||||||
|
nativeVersusCustomNotificationsGroupBox.TabStop = false;
|
||||||
|
//
|
||||||
|
// useCustomTrayNotifications
|
||||||
|
//
|
||||||
|
useCustomTrayNotifications.AutoSize = true;
|
||||||
|
useCustomTrayNotifications.Location = new System.Drawing.Point(6, 40);
|
||||||
|
useCustomTrayNotifications.Name = "useCustomTrayNotifications";
|
||||||
|
useCustomTrayNotifications.Size = new System.Drawing.Size(267, 19);
|
||||||
|
useCustomTrayNotifications.TabIndex = 1;
|
||||||
|
useCustomTrayNotifications.TabStop = true;
|
||||||
|
useCustomTrayNotifications.Text = "Use ntfysh-windows custom tray notifications";
|
||||||
|
useCustomTrayNotifications.UseVisualStyleBackColor = true;
|
||||||
|
useCustomTrayNotifications.CheckedChanged += UseCustomTrayNotifications_CheckedChanged;
|
||||||
|
//
|
||||||
|
// useNativeWindowsNotifications
|
||||||
|
//
|
||||||
|
useNativeWindowsNotifications.AutoSize = true;
|
||||||
|
useNativeWindowsNotifications.Location = new System.Drawing.Point(6, 15);
|
||||||
|
useNativeWindowsNotifications.Name = "useNativeWindowsNotifications";
|
||||||
|
useNativeWindowsNotifications.Size = new System.Drawing.Size(203, 19);
|
||||||
|
useNativeWindowsNotifications.TabIndex = 0;
|
||||||
|
useNativeWindowsNotifications.TabStop = true;
|
||||||
|
useNativeWindowsNotifications.Text = "Use Windows' native notifications";
|
||||||
|
useNativeWindowsNotifications.UseVisualStyleBackColor = true;
|
||||||
|
//
|
||||||
|
// groupCustomNotificationSettings
|
||||||
|
//
|
||||||
|
groupCustomNotificationSettings.Controls.Add(customNotificationsPlayWindowsNotificationAudio);
|
||||||
|
groupCustomNotificationSettings.Controls.Add(customNotificationsShowInDarkMode);
|
||||||
|
groupCustomNotificationSettings.Controls.Add(customNotificationsShowTimeoutBar);
|
||||||
|
groupCustomNotificationSettings.Location = new System.Drawing.Point(12, 243);
|
||||||
|
groupCustomNotificationSettings.Name = "groupCustomNotificationSettings";
|
||||||
|
groupCustomNotificationSettings.Size = new System.Drawing.Size(504, 87);
|
||||||
|
groupCustomNotificationSettings.TabIndex = 10;
|
||||||
|
groupCustomNotificationSettings.TabStop = false;
|
||||||
|
//
|
||||||
|
// customNotificationsPlayWindowsNotificationAudio
|
||||||
|
//
|
||||||
|
customNotificationsPlayWindowsNotificationAudio.AutoSize = true;
|
||||||
|
customNotificationsPlayWindowsNotificationAudio.Location = new System.Drawing.Point(4, 59);
|
||||||
|
customNotificationsPlayWindowsNotificationAudio.Name = "customNotificationsPlayWindowsNotificationAudio";
|
||||||
|
customNotificationsPlayWindowsNotificationAudio.Size = new System.Drawing.Size(200, 19);
|
||||||
|
customNotificationsPlayWindowsNotificationAudio.TabIndex = 2;
|
||||||
|
customNotificationsPlayWindowsNotificationAudio.Text = "Play Windows notification sound";
|
||||||
|
customNotificationsPlayWindowsNotificationAudio.UseVisualStyleBackColor = true;
|
||||||
|
//
|
||||||
|
// customNotificationsShowInDarkMode
|
||||||
|
//
|
||||||
|
customNotificationsShowInDarkMode.AutoSize = true;
|
||||||
|
customNotificationsShowInDarkMode.Location = new System.Drawing.Point(6, 37);
|
||||||
|
customNotificationsShowInDarkMode.Name = "customNotificationsShowInDarkMode";
|
||||||
|
customNotificationsShowInDarkMode.Size = new System.Drawing.Size(197, 19);
|
||||||
|
customNotificationsShowInDarkMode.TabIndex = 1;
|
||||||
|
customNotificationsShowInDarkMode.Text = "Show notifications in dark mode";
|
||||||
|
customNotificationsShowInDarkMode.UseVisualStyleBackColor = true;
|
||||||
|
//
|
||||||
|
// customNotificationsShowTimeoutBar
|
||||||
|
//
|
||||||
|
customNotificationsShowTimeoutBar.AutoSize = true;
|
||||||
|
customNotificationsShowTimeoutBar.Location = new System.Drawing.Point(6, 14);
|
||||||
|
customNotificationsShowTimeoutBar.Name = "customNotificationsShowTimeoutBar";
|
||||||
|
customNotificationsShowTimeoutBar.Size = new System.Drawing.Size(211, 19);
|
||||||
|
customNotificationsShowTimeoutBar.TabIndex = 0;
|
||||||
|
customNotificationsShowTimeoutBar.Text = "Show time-out bar on notifications";
|
||||||
|
customNotificationsShowTimeoutBar.UseVisualStyleBackColor = true;
|
||||||
|
//
|
||||||
|
// label1
|
||||||
|
//
|
||||||
|
label1.AutoSize = true;
|
||||||
|
label1.Location = new System.Drawing.Point(12, 227);
|
||||||
|
label1.Name = "label1";
|
||||||
|
label1.Size = new System.Drawing.Size(180, 15);
|
||||||
|
label1.TabIndex = 11;
|
||||||
|
label1.Text = "Custom tray notification settings";
|
||||||
|
//
|
||||||
// SettingsDialog
|
// SettingsDialog
|
||||||
//
|
//
|
||||||
AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
|
AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
|
||||||
AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
||||||
BackColor = System.Drawing.Color.White;
|
BackColor = System.Drawing.Color.White;
|
||||||
ClientSize = new System.Drawing.Size(531, 201);
|
ClientSize = new System.Drawing.Size(531, 387);
|
||||||
|
Controls.Add(label1);
|
||||||
|
Controls.Add(groupCustomNotificationSettings);
|
||||||
|
Controls.Add(nativeVersusCustomNotificationsGroupBox);
|
||||||
Controls.Add(reconnectAttemptDelay);
|
Controls.Add(reconnectAttemptDelay);
|
||||||
Controls.Add(reconnectAttemptDelayLabel);
|
Controls.Add(reconnectAttemptDelayLabel);
|
||||||
Controls.Add(reconnectAttempts);
|
Controls.Add(reconnectAttempts);
|
||||||
@@ -156,6 +252,10 @@ namespace ntfysh_client
|
|||||||
((System.ComponentModel.ISupportInitialize)timeout).EndInit();
|
((System.ComponentModel.ISupportInitialize)timeout).EndInit();
|
||||||
((System.ComponentModel.ISupportInitialize)reconnectAttempts).EndInit();
|
((System.ComponentModel.ISupportInitialize)reconnectAttempts).EndInit();
|
||||||
((System.ComponentModel.ISupportInitialize)reconnectAttemptDelay).EndInit();
|
((System.ComponentModel.ISupportInitialize)reconnectAttemptDelay).EndInit();
|
||||||
|
nativeVersusCustomNotificationsGroupBox.ResumeLayout(false);
|
||||||
|
nativeVersusCustomNotificationsGroupBox.PerformLayout();
|
||||||
|
groupCustomNotificationSettings.ResumeLayout(false);
|
||||||
|
groupCustomNotificationSettings.PerformLayout();
|
||||||
ResumeLayout(false);
|
ResumeLayout(false);
|
||||||
PerformLayout();
|
PerformLayout();
|
||||||
}
|
}
|
||||||
@@ -171,5 +271,13 @@ namespace ntfysh_client
|
|||||||
private System.Windows.Forms.Label reconnectAttemptsLabel;
|
private System.Windows.Forms.Label reconnectAttemptsLabel;
|
||||||
private System.Windows.Forms.NumericUpDown reconnectAttemptDelay;
|
private System.Windows.Forms.NumericUpDown reconnectAttemptDelay;
|
||||||
private System.Windows.Forms.Label reconnectAttemptDelayLabel;
|
private System.Windows.Forms.Label reconnectAttemptDelayLabel;
|
||||||
|
private System.Windows.Forms.GroupBox nativeVersusCustomNotificationsGroupBox;
|
||||||
|
private System.Windows.Forms.RadioButton useCustomTrayNotifications;
|
||||||
|
private System.Windows.Forms.RadioButton useNativeWindowsNotifications;
|
||||||
|
private System.Windows.Forms.GroupBox groupCustomNotificationSettings;
|
||||||
|
private System.Windows.Forms.CheckBox customNotificationsShowTimeoutBar;
|
||||||
|
private System.Windows.Forms.CheckBox customNotificationsShowInDarkMode;
|
||||||
|
private System.Windows.Forms.Label label1;
|
||||||
|
private System.Windows.Forms.CheckBox customNotificationsPlayWindowsNotificationAudio;
|
||||||
}
|
}
|
||||||
}
|
}
|
@@ -1,10 +1,13 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Windows.Forms;
|
using System.Windows.Forms;
|
||||||
|
using static ntfysh_client.SettingsModel;
|
||||||
|
|
||||||
namespace ntfysh_client
|
namespace ntfysh_client
|
||||||
{
|
{
|
||||||
public partial class SettingsDialog : Form
|
public partial class SettingsDialog : Form
|
||||||
{
|
{
|
||||||
|
public NotificationsType NotificationsMethod { get; set; }
|
||||||
|
|
||||||
public decimal Timeout
|
public decimal Timeout
|
||||||
{
|
{
|
||||||
get => timeout.Value;
|
get => timeout.Value;
|
||||||
@@ -23,9 +26,53 @@ namespace ntfysh_client
|
|||||||
set => reconnectAttemptDelay.Value = value;
|
set => reconnectAttemptDelay.Value = value;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#region: Native vs custom notifications options. Because these are in a group box, these are mutualy exclusive.
|
||||||
|
public bool UseNativeWindowsNotifications
|
||||||
|
{
|
||||||
|
get => useNativeWindowsNotifications.Checked;
|
||||||
|
set
|
||||||
|
{
|
||||||
|
useNativeWindowsNotifications.Checked = value;
|
||||||
|
groupCustomNotificationSettings.Enabled = !value;
|
||||||
|
NotificationsMethod = (value) ? NotificationsType.NativeWindows : NotificationsType.CustomTray;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public bool UseCustomTrayNotifications
|
||||||
|
{
|
||||||
|
get => useCustomTrayNotifications.Checked;
|
||||||
|
set {
|
||||||
|
useCustomTrayNotifications.Checked = value;
|
||||||
|
groupCustomNotificationSettings.Enabled = value;
|
||||||
|
NotificationsMethod = (value) ? NotificationsType.NativeWindows : NotificationsType.CustomTray;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
#region: Custom tray notification options
|
||||||
|
public bool CustomTrayNotificationsShowTimeoutBar
|
||||||
|
{
|
||||||
|
get => customNotificationsShowTimeoutBar.Checked;
|
||||||
|
set => customNotificationsShowTimeoutBar.Checked = value;
|
||||||
|
}
|
||||||
|
|
||||||
|
public bool CustomTrayNotificationsShowInDarkMode
|
||||||
|
{
|
||||||
|
get => customNotificationsShowInDarkMode.Checked;
|
||||||
|
set => customNotificationsShowInDarkMode.Checked = value;
|
||||||
|
}
|
||||||
|
|
||||||
|
public bool CustomTrayNotificationsPlayDefaultWindowsSound
|
||||||
|
{
|
||||||
|
get => customNotificationsPlayWindowsNotificationAudio.Checked;
|
||||||
|
set => customNotificationsPlayWindowsNotificationAudio.Checked = value;
|
||||||
|
}
|
||||||
|
#endregion
|
||||||
|
|
||||||
public SettingsDialog()
|
public SettingsDialog()
|
||||||
{
|
{
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
|
SetNotificationsUiElements();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void saveButton_Click(object sender, EventArgs e)
|
private void saveButton_Click(object sender, EventArgs e)
|
||||||
@@ -37,5 +84,19 @@ namespace ntfysh_client
|
|||||||
{
|
{
|
||||||
DialogResult = DialogResult.Cancel;
|
DialogResult = DialogResult.Cancel;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void SetNotificationsUiElements()
|
||||||
|
{
|
||||||
|
groupCustomNotificationSettings.Enabled = useCustomTrayNotifications.Checked;
|
||||||
|
timeoutLabel.Text = useCustomTrayNotifications.Checked ? _customNotificationsTimeout : _windowsNotificationsTimeout;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void UseCustomTrayNotifications_CheckedChanged(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
SetNotificationsUiElements();
|
||||||
|
}
|
||||||
|
|
||||||
|
private const string _windowsNotificationsTimeout = "Notification Toast Timeout (seconds, may be ignored by OS based on accessibility settings):";
|
||||||
|
private const string _customNotificationsTimeout = "Notification Toast Timeout (seconds, use 0 to require closing notification):";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -2,9 +2,19 @@
|
|||||||
{
|
{
|
||||||
public class SettingsModel
|
public class SettingsModel
|
||||||
{
|
{
|
||||||
|
public enum NotificationsType
|
||||||
|
{
|
||||||
|
NativeWindows,
|
||||||
|
CustomTray
|
||||||
|
}
|
||||||
|
|
||||||
public uint Revision { get; set; }
|
public uint Revision { get; set; }
|
||||||
public decimal Timeout { get; set; }
|
public decimal Timeout { get; set; }
|
||||||
public decimal ReconnectAttempts { get; set; }
|
public decimal ReconnectAttempts { get; set; }
|
||||||
public decimal ReconnectAttemptDelay { get; set; }
|
public decimal ReconnectAttemptDelay { get; set; }
|
||||||
|
public NotificationsType NotificationsMethod { get; set; }
|
||||||
|
public bool CustomTrayNotificationsShowTimeoutBar { get; set; }
|
||||||
|
public bool CustomTrayNotificationsShowInDarkMode { get; set; }
|
||||||
|
public bool CustomTrayNotificationsPlayDefaultWindowsSound { get; set; }
|
||||||
}
|
}
|
||||||
}
|
}
|
12
ntfysh_client/Themes/BaseTheme.cs
Normal file
12
ntfysh_client/Themes/BaseTheme.cs
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
using System.Drawing;
|
||||||
|
|
||||||
|
namespace ntfysh_client.Themes
|
||||||
|
{
|
||||||
|
internal abstract class BaseTheme
|
||||||
|
{
|
||||||
|
public abstract Color BackgroundColor {get; }
|
||||||
|
public abstract Color ControlBackGroundColor {get; }
|
||||||
|
public abstract Color ControlMouseOverBackgroundColor { get; }
|
||||||
|
public abstract Color ForegroundColor { get; }
|
||||||
|
}
|
||||||
|
}
|
12
ntfysh_client/Themes/DarkModeTheme.cs
Normal file
12
ntfysh_client/Themes/DarkModeTheme.cs
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
using System.Drawing;
|
||||||
|
|
||||||
|
namespace ntfysh_client.Themes
|
||||||
|
{
|
||||||
|
internal class DarkModeTheme: BaseTheme
|
||||||
|
{
|
||||||
|
public override Color BackgroundColor { get => SystemColors.ControlDark; }
|
||||||
|
public override Color ControlBackGroundColor { get => Color.Black; }
|
||||||
|
public override Color ControlMouseOverBackgroundColor { get => Color.Silver; }
|
||||||
|
public override Color ForegroundColor { get => SystemColors.WindowText; }
|
||||||
|
}
|
||||||
|
}
|
12
ntfysh_client/Themes/DefaultTheme.cs
Normal file
12
ntfysh_client/Themes/DefaultTheme.cs
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
using System.Drawing;
|
||||||
|
|
||||||
|
namespace ntfysh_client.Themes
|
||||||
|
{
|
||||||
|
internal class DefaultTheme: BaseTheme
|
||||||
|
{
|
||||||
|
public override Color BackgroundColor { get => Color.White; }
|
||||||
|
public override Color ControlBackGroundColor { get => SystemColors.ControlDark; }
|
||||||
|
public override Color ControlMouseOverBackgroundColor { get => Color.CadetBlue; }
|
||||||
|
public override Color ForegroundColor { get => SystemColors.WindowText; }
|
||||||
|
}
|
||||||
|
}
|
Reference in New Issue
Block a user