From 871b942c7c87dde3a9ec0ade42aa3bbe81b36aee Mon Sep 17 00:00:00 2001
From: Humdinger <humdingerb@gmail.com>
Date: Sat, 8 Jul 2017 18:51:04 +0200
Subject: [PATCH] Package daemon notifications
* Sentence casing
* Adding package daemon icon to notifications
* Have "Package daemon" as group name and "Warning" as title
Addresses part of #13590.
---
src/servers/package/Jamfile | 1 +
src/servers/package/PackageManager.cpp | 26 ++++++++++++++++++++++++--
src/servers/package/PackageManager.h | 3 +++
3 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/src/servers/package/Jamfile b/src/servers/package/Jamfile
index ee33ef7..1c0e5c9 100644
a
|
b
|
Server package_daemon
|
33 | 33 | DoCatalogs package_daemon : |
34 | 34 | x-vnd.haiku-package_daemon |
35 | 35 | : |
| 36 | PackageManager.cpp |
36 | 37 | ProblemWindow.cpp |
37 | 38 | ResultWindow.cpp |
38 | 39 | ; |
diff --git a/src/servers/package/PackageManager.cpp b/src/servers/package/PackageManager.cpp
index adaffff..77d9486 100644
a
|
b
|
|
6 | 6 | |
7 | 7 | #include "PackageManager.h" |
8 | 8 | |
| 9 | #include <Catalog.h> |
| 10 | #include <NodeInfo.h> |
9 | 11 | #include <Notification.h> |
10 | 12 | #include <package/DownloadFileRequest.h> |
11 | 13 | #include <package/RefreshRepositoryRequest.h> |
… |
… |
|
13 | 15 | #include <package/solver/SolverPackageSpecifierList.h> |
14 | 16 | #include <package/solver/SolverProblem.h> |
15 | 17 | #include <package/solver/SolverProblemSolution.h> |
| 18 | #include <Roster.h> |
16 | 19 | |
17 | 20 | #include <AutoDeleter.h> |
18 | 21 | #include <package/manager/Exceptions.h> |
… |
… |
|
24 | 27 | #include "Root.h" |
25 | 28 | #include "Volume.h" |
26 | 29 | |
| 30 | #undef B_TRANSLATION_CONTEXT |
| 31 | #define B_TRANSLATION_CONTEXT "PackageManager" |
27 | 32 | |
28 | 33 | using BPackageKit::BManager::BPrivate::BAbortedByUserException; |
29 | 34 | using BPackageKit::BManager::BPrivate::BFatalErrorException; |
30 | 35 | using BPackageKit::BManager::BPrivate::BRepositoryBuilder; |
31 | 36 | |
32 | | |
33 | 37 | PackageManager::PackageManager(Root* root, Volume* volume) |
34 | 38 | : |
35 | 39 | BPackageManager(volume->Location(), this, this), |
… |
… |
PackageManager::Warn(status_t error, const char* format, ...)
|
306 | 310 | message << BString().SetToFormat(": %s", strerror(error)); |
307 | 311 | |
308 | 312 | BNotification notification(B_ERROR_NOTIFICATION); |
309 | | notification.SetTitle("Package Daemon"); |
| 313 | notification.SetGroup(B_TRANSLATE("Package daemon")); |
| 314 | notification.SetTitle(B_TRANSLATE("Warning")); |
310 | 315 | notification.SetContent(message); |
| 316 | BBitmap icon(_GetIcon()); |
| 317 | if (icon.IsValid()) |
| 318 | notification.SetIcon(&icon); |
311 | 319 | notification.Send(); |
312 | 320 | } |
313 | 321 | |
… |
… |
PackageManager::_InitGui()
|
404 | 412 | if (server == NULL || server->InitGUIContext() != B_OK) |
405 | 413 | throw BFatalErrorException("failed to initialize the GUI"); |
406 | 414 | } |
| 415 | |
| 416 | |
| 417 | BBitmap |
| 418 | PackageManager::_GetIcon() |
| 419 | { |
| 420 | int32 iconSize = B_LARGE_ICON; |
| 421 | BBitmap icon(BRect(0, 0, iconSize - 1, iconSize - 1), 0, B_RGBA32); |
| 422 | team_info teamInfo; |
| 423 | get_team_info(B_CURRENT_TEAM, &teamInfo); |
| 424 | app_info appInfo; |
| 425 | be_roster->GetRunningAppInfo(teamInfo.team, &appInfo); |
| 426 | BNodeInfo::GetTrackerIcon(&appInfo.ref, &icon, icon_size(iconSize)); |
| 427 | return icon; |
| 428 | } |
diff --git a/src/servers/package/PackageManager.h b/src/servers/package/PackageManager.h
index 123890d..e006c3a 100644
a
|
b
|
|
9 | 9 | #include <map> |
10 | 10 | #include <set> |
11 | 11 | |
| 12 | #include <Bitmap.h> |
12 | 13 | #include <package/Context.h> |
13 | 14 | #include <package/Job.h> |
14 | 15 | |
… |
… |
private:
|
99 | 100 | |
100 | 101 | void _InitGui(); |
101 | 102 | |
| 103 | BBitmap _GetIcon(); |
| 104 | |
102 | 105 | private: |
103 | 106 | Root* fRoot; |
104 | 107 | Volume* fVolume; |