github/portmaster
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

(UI) minor update of update pause notification messages

Browse Source
This commit is contained in:
Alexandr Stelnykovych
2025-11-21 14:07:57 +02:00
parent 7341fb3068
commit 4913147dd5
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
desktop/angular/src/app/layout/navigation/navigation.ts
View File

@@ -313,9 +313,17 @@ export class NavigationComponent implements OnInit {
event.preventDefault(); event.preventDefault();
event.stopPropagation(); event.stopPropagation();
let msg = 'Resuming ...';
if (this.pauseState?.Interception===true && this.pauseState?.SPN===true)
msg = 'Resuming Portmaster and SPN ...';
else if (this.pauseState?.Interception===true)
msg = 'Resuming Portmaster ...';
else if (this.pauseState?.SPN===true)
msg = 'Resuming SPN ...';
this.portapi.resume() this.portapi.resume()
.subscribe(this.actionIndicator.httpObserver( .subscribe(this.actionIndicator.httpObserver(
'Resuming ...', msg,
'Failed to Resume', 'Failed to Resume',
)) ))
} }

2
service/control/pause.go
View File

@@ -204,7 +204,7 @@ func (c *Control) updateStatesAndNotify() {
title = "SPN paused" title = "SPN paused"
nType = notifications.Info // less severe notification for SPN-only pause nType = notifications.Info // less severe notification for SPN-only pause
} }
message := fmt.Sprintf("%s till %v", title, c.pauseInfo.TillTime.Format(time.TimeOnly)) message := fmt.Sprintf("%s until %v", title, c.pauseInfo.TillTime.Format(time.TimeOnly))
c.pauseNotification = &notifications.Notification{ c.pauseNotification = &notifications.Notification{
EventID: "control:paused", EventID: "control:paused",