Smartcraft-Media-Tech/ntfysh-windows
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases 4 Wiki Activity

use seconds for value of timeout rather then mS

Browse Source
This commit is contained in:
mshafer1
2024-12-21 09:53:57 -06:00
parent 025a7d04f8
commit 5f57898f9b
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ntfysh_client/MainForm.cs
View File

@@ -81,9 +81,9 @@ namespace ntfysh_client
{ {
_notificationDialog.ShowNotification( _notificationDialog.ShowNotification(
title: finalTitle, title: finalTitle,
message: e.Message, message: e.Message,
timeout_ms: (int)TimeSpan.FromSeconds((double)Program.Settings.Timeout).TotalMilliseconds, timeoutSeconds: (int)Program.Settings.Timeout,
icon: priorityIcon, icon: priorityIcon,
showTimeOutBar: Program.Settings.CustomTrayNotificationsShowTimeoutBar, showTimeOutBar: Program.Settings.CustomTrayNotificationsShowTimeoutBar,
showInDarkMode: Program.Settings.CustomTrayNotificationsShowInDarkMode showInDarkMode: Program.Settings.CustomTrayNotificationsShowInDarkMode

14
ntfysh_client/NotificationDialog.cs
View File

@@ -15,7 +15,7 @@ namespace ntfysh_client
private const int ScreenMargin = 20; private const int ScreenMargin = 20;
private int _timeout = 0; private int _timeoutSeconds = 0;
private System.Timers.Timer? _displayTimeoutTimer = null; private System.Timers.Timer? _displayTimeoutTimer = null;
private System.Windows.Forms.Timer? _updateTimer = null; private System.Windows.Forms.Timer? _updateTimer = null;
private Stopwatch? _shownStopwatch = null; private Stopwatch? _shownStopwatch = null;
@@ -33,7 +33,7 @@ namespace ntfysh_client
InitializeWindowHidden(); InitializeWindowHidden();
} }
public void ShowNotification(string title, string message, int timeout_ms = -1, ToolTipIcon? icon = null, bool showTimeOutBar = true, bool showInDarkMode = true) public void ShowNotification(string title, string message, int timeoutSeconds = 0, ToolTipIcon? icon = null, bool showTimeOutBar = true, bool showInDarkMode = true)
{ {
if (Visible) if (Visible)
{ {
@@ -71,9 +71,9 @@ namespace ntfysh_client
_updateTimer.Dispose(); _updateTimer.Dispose();
} }
if (timeout_ms > 0) if (timeoutSeconds > 0)
{ {
_displayTimeoutTimer = new System.Timers.Timer(timeout_ms); _displayTimeoutTimer = new System.Timers.Timer(timeoutSeconds * 1000);
_displayTimeoutTimer.Elapsed += HandleTimeout; _displayTimeoutTimer.Elapsed += HandleTimeout;
_displayTimeoutTimer.Start(); _displayTimeoutTimer.Start();
@@ -90,7 +90,7 @@ namespace ntfysh_client
ProgressBar1.Visible = true; ProgressBar1.Visible = true;
LblTimeout.Visible = true; LblTimeout.Visible = true;
_timeout = timeout_ms; _timeoutSeconds = timeoutSeconds;
} }
else else
{ {
@@ -138,8 +138,8 @@ namespace ntfysh_client
{ {
if (_shownStopwatch is null) return; if (_shownStopwatch is null) return;
ProgressBar1.Value = (int)((_timeout - _shownStopwatch.ElapsedMilliseconds) * 100 / _timeout); ProgressBar1.Value = (_timeoutSeconds - _shownStopwatch.Elapsed.Seconds) * 100 / _timeoutSeconds;
LblTimeout.Text = $"{(int)(_timeout - _shownStopwatch.ElapsedMilliseconds) / 1000}"; LblTimeout.Text = $"{_timeoutSeconds - _shownStopwatch.Elapsed.Seconds}";
} }
protected override void SetVisibleCore(bool value) protected override void SetVisibleCore(bool value)