Ticket #13590: 0002-Package-daemon-notifications.patch

headers/os/interface/Bitmap.h

@@ -114 +114 @@
 private:
     friend class BView;
     friend class BApplication;
-    friend class BPrivate::BPrivateScreen;
+    friend class ::BPrivate::BPrivateScreen;
     friend class Private;
 
     virtual status_t            Perform(perform_code d, void* arg);

src/kits/package/Jamfile

@@ -143 +143 @@
 }
 
 HaikuSubInclude solver ;
+
+DoCatalogs libpackage.so
+    x-vnd.Haiku-libpackage
+    :
+    PackageManager.cpp
+;

src/kits/package/manager/PackageManager.cpp

@@ -10 +10 @@
 
 #include <package/manager/PackageManager.h>
 
+#include <Catalog.h>
 #include <Directory.h>
 #include <package/CommitTransactionResult.h>
 #include <package/DownloadFileRequest.h>
@@ -32 +33 @@
 
 #include "PackageManagerUtils.h"
 
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "PackageManagerKit"
+
 
 using BPackageKit::BPrivate::FetchFileJob;
 using BPackageKit::BPrivate::ValidateChecksumJob;
@@ -126 +130 @@
         error = roster.GetRepositoryNames(repositoryNames);
         if (error != B_OK) {
             fUserInteractionHandler->Warn(error,
-                "Failed to get repository names");
+                B_TRANSLATE("Failed to get repository names"));
         }
 
         int32 repositoryNameCount = repositoryNames.CountStrings();
@@ -619 +623 @@
             .GetEntry(&transactionDirectoryEntry)) != B_OK
         || (error = transactionDirectoryEntry.Remove()) != B_OK) {
         fUserInteractionHandler->Warn(error,
-            "Failed to remove transaction directory");
+            B_TRANSLATE("Failed to remove transaction directory"));
     }
 
     fUserInteractionHandler->ProgressApplyingChangesDone(
@@ -669 +673 @@
     }
 
     if (basePackage == NULL) {
-        fUserInteractionHandler->Warn(B_OK, "Package %s-%s doesn't have a "
-            "matching requires for its base package \"%s\"",
+        fUserInteractionHandler->Warn(B_OK, B_TRANSLATE("Package %s-%s "
+            "doesn't have a matching requires for its base package \"%s\""),
             info.Name().String(), info.Version().ToString().String(),
             info.BasePackage().String());
         return -1;
@@ -711 +715 @@
     BRepositoryConfig config;
     status_t error = roster.GetRepositoryConfig(name, &config);
     if (error != B_OK) {
-        fUserInteractionHandler->Warn(error,
-            "Failed to get config for repository \"%s\". Skipping.", name);
+        fUserInteractionHandler->Warn(error, B_TRANSLATE(
+            "Failed to get config for repository \"%s\". Skipping."), name);
         return;
     }
 
     BRepositoryCache cache;
     error = _GetRepositoryCache(roster, config, refresh, cache);
     if (error != B_OK) {
-        fUserInteractionHandler->Warn(error,
-            "Failed to get cache for repository \"%s\". Skipping.", name);
+        fUserInteractionHandler->Warn(error, B_TRANSLATE(
+            "Failed to get cache for repository \"%s\". Skipping."), name);
         return;
     }
 
@@ -744 +748 @@
 
     status_t error = RefreshRepository(config);
     if (error != B_OK) {
-        fUserInteractionHandler->Warn(error,
-            "Refreshing repository \"%s\" failed", config.Name().String());
+        fUserInteractionHandler->Warn(error, B_TRANSLATE(
+            "Refreshing repository \"%s\" failed"), config.Name().String());
     }
 
     return roster.GetRepositoryCache(config.Name(), &_cache);

src/servers/package/Jamfile

@@ -33 +33 @@
 DoCatalogs package_daemon :
     x-vnd.haiku-package_daemon
     :
+    PackageManager.cpp
     ProblemWindow.cpp
     ResultWindow.cpp
 ;

src/servers/package/PackageManager.cpp

@@ -6 +6 @@
 
 #include "PackageManager.h"
 
+#include <Catalog.h>
+#include <NodeInfo.h>
 #include <Notification.h>
 #include <package/DownloadFileRequest.h>
 #include <package/RefreshRepositoryRequest.h>
@@ -13 +15 @@
 #include <package/solver/SolverPackageSpecifierList.h>
 #include <package/solver/SolverProblem.h>
 #include <package/solver/SolverProblemSolution.h>
+#include <Roster.h>
 
 #include <AutoDeleter.h>
 #include <package/manager/Exceptions.h>
@@ -24 +27 @@
 #include "Root.h"
 #include "Volume.h"
 
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "PackageManager"
 
 using BPackageKit::BManager::BPrivate::BAbortedByUserException;
 using BPackageKit::BManager::BPrivate::BFatalErrorException;
 using BPackageKit::BManager::BPrivate::BRepositoryBuilder;
 
-
 PackageManager::PackageManager(Root* root, Volume* volume)
     :
     BPackageManager(volume->Location(), this, this),
@@ -306 +310 @@
         message << BString().SetToFormat(": %s", strerror(error));
 
     BNotification notification(B_ERROR_NOTIFICATION);
-    notification.SetTitle("Package Daemon");
+    notification.SetGroup(B_TRANSLATE("Package daemon"));
+    notification.SetTitle(B_TRANSLATE("Warning"));
     notification.SetContent(message);
+    BBitmap icon(_GetIcon());
+    if (icon.IsValid())
+        notification.SetIcon(&icon);
     notification.Send();
 }
 
@@ -404 +412 @@
     if (server == NULL || server->InitGUIContext() != B_OK)
         throw BFatalErrorException("failed to initialize the GUI");
 }
+
+
+BBitmap
+PackageManager::_GetIcon()
+{
+    int32 iconSize = B_LARGE_ICON;
+    BBitmap icon(BRect(0, 0, iconSize - 1, iconSize - 1), 0, B_RGBA32);
+    team_info teamInfo;
+    get_team_info(B_CURRENT_TEAM, &teamInfo);
+    app_info appInfo;
+    be_roster->GetRunningAppInfo(teamInfo.team, &appInfo);
+    BNodeInfo::GetTrackerIcon(&appInfo.ref, &icon, icon_size(iconSize));
+    return icon;
+}

src/servers/package/PackageManager.h

@@ -9 +9 @@
 #include <map>
 #include <set>
 
+#include <Bitmap.h>
 #include <package/Context.h>
 #include <package/Job.h>
 
@@ -99 +100 @@
 
             void                _InitGui();
 
+            BBitmap             _GetIcon();
+
 private:
             Root*               fRoot;
             Volume*             fVolume;