Ticket #1245: notifications1.patch

headers/os/app/Notification.h

@@ -6 +6 @@
 #define _NOTIFICATION_H
 
 
+#include <Archivable.h>
 #include <Entry.h>
 #include <List.h>
 #include <String.h>
@@ -22 +23 @@
 class BBitmap;
 
 
-class BNotification {
+class BNotification : public BArchivable {
 public:
                                 BNotification(notification_type type);
-                                ~BNotification();
+                                BNotification(BMessage* archive);
+    virtual                     ~BNotification();
+
+            status_t            InitCheck() const;
+
+    static  BArchivable*        Instantiate(BMessage* archive);
+    virtual status_t            Archive(BMessage* archive, bool deep = true) const;
 
             notification_type   Type() const;
 
-            const char*         Application() const;
-            void                SetApplication(const BString& app);
+            const char*         Group() const;
+            void                SetGroup(const BString& group);
 
             const char*         Title() const;
             void                SetTitle(const BString& title);
@@ -61 +68 @@
             const BBitmap*      Icon() const;
             status_t            SetIcon(const BBitmap* icon);
 
+            status_t            Send(bigtime_t timeout = -1);
+
 private:
+            status_t            fInitStatus;
+
             notification_type   fType;
-            BString             fAppName;
+            BString             fGroup;
             BString             fTitle;
             BString             fContent;
             BString             fID;

headers/os/app/Roster.h

@@ -13 +13 @@
 class BFile;
 class BMimeType;
 class BNodeInfo;
-class BNotification;
 
 
 struct app_info {
@@ -117 +116 @@
         void AddToRecentFolders(const entry_ref *folder,
                     const char *appSig = 0) const;
 
-        // notifications
-        status_t Notify(const BNotification& notification,
-                    bigtime_t timeout = -1) const;
-
         // private/reserved stuff starts here
         class Private;
 

headers/private/notification/AppUsage.h

@@ -19 +19 @@
 class BMessage;
 class NotificationReceived;
 
-typedef std::map<BString, NotificationReceived*> notify_t;
+typedef std::map<BString, NotificationReceived*> notification_t;
 
 class AppUsage : public BFlattenable {
 public:
                                         AppUsage();
-                                        AppUsage(entry_ref ref, const char* name,
+                                        AppUsage(const char* name,
                                             bool allow = true);
                                         ~AppUsage();
 
@@ -36 +36 @@
     virtual status_t                    Unflatten(type_code code, const void* buffer,
                                             ssize_t numBytes);
 
-            entry_ref                   Ref();
             const char*                 Name();
             bool                        Allowed(const char* title, notification_type type);
             bool                        Allowed();
@@ -45 +44 @@
             void                        AddNotification(NotificationReceived* notification);
 
 private:
-            entry_ref                   fRef;
             BString                     fName;
             bool                        fAllow;
-            notify_t                    fNotifications;
+            notification_t              fNotifications;
 };
 
 #endif  // _APP_USAGE_H

headers/private/notification/Notifications.h

@@ -12 +12 @@
 // Messages
 const uint32 kNotificationMessage       = 'nssm';
 
-// Notification layout
-enum infoview_layout {
-    TitleAboveIcon = 0,
-    AllTextRightOfIcon = 1
-};
-
 // Settings constants
 extern const char* kSettingsDirectory;
 extern const char* kFiltersSettings;
@@ -40 +34 @@
 // Display default settings
 const float kDefaultWidth               = 300.0f;
 const icon_size kDefaultIconSize        = B_LARGE_ICON;
-const infoview_layout kDefaultLayout    = TitleAboveIcon;
 
 #endif  // _NOTIFICATIONS_H

src/bin/notify.cpp

@@ -10 +10 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 
 #include <Application.h>
 #include <Bitmap.h>
@@ -19 +18 @@
 #include <Mime.h>
 #include <Notification.h>
 #include <Path.h>
-#include <Roster.h>
 #include <TranslationUtils.h>
 
 const char* kSignature          = "application/x-vnd.Haiku-notify";
@@ -52 +50 @@
 private:
             bool                fHasGoodArguments;
             notification_type   fType;
-            char*               fAppName;
-            char*               fTitle;
-            char*               fMsgId;
+            BString             fGroup;
+            BString             fTitle;
+            BString             fMsgId;
             float               fProgress;
             bigtime_t           fTimeout;
-            char*               fIconFile;
+            BString             fIconFile;
             entry_ref           fFileRef;
-            char*               fMessage;
-            char*               fApp;
+            BString             fContent;
+            BString             fOnClickApp;
             bool                fHasFile;
             entry_ref           fFile;
             BList*              fRefs;
@@ -76 +74 @@
     BApplication(kSignature),
     fHasGoodArguments(false),
     fType(B_INFORMATION_NOTIFICATION),
-    fAppName(NULL),
-    fTitle(NULL),
-    fMsgId(NULL),
     fProgress(0.0f),
-    fTimeout(0),
-    fIconFile(NULL),
-    fMessage(NULL),
-    fApp(NULL),
+    fTimeout(-1),
     fHasFile(false)
 {
     fRefs = new BList();
@@ -93 +85 @@
 
 NotifyApp::~NotifyApp()
 {
-    free(fAppName);
-    free(fTitle);
-    free(fMsgId);
-    free(fIconFile);
-    free(fMessage);
-    free(fApp);
-
     for (int32 i = 0; void* item = fRefs->ItemAt(i); i++)
         delete (BEntry*)item;
     delete fRefs;
 
     for (int32 i = 0; void* item = fArgv->ItemAt(i); i++)
-        free(item);
+        delete (BString*)item;
     delete fArgv;
 }
 
@@ -134 +119 @@
                     if (strncmp(kTypeNames[i], argument, strlen(argument)) == 0)
                         fType = (notification_type)i;
                 }
-            } else if (strcmp(option, "app") == 0)
-                fAppName = strdup(argument);
+            } else if (strcmp(option, "group") == 0)
+                fGroup = argument;
             else if (strcmp(option, "title") == 0)
-                fTitle = strdup(argument);
+                fTitle = argument;
             else if (strcmp(option, "messageID") == 0)
-                fMsgId = strdup(argument);
+                fMsgId = argument;
             else if (strcmp(option, "progress") == 0)
                 fProgress = atof(argument);
             else if (strcmp(option, "timeout") == 0)
                 fTimeout = atol(argument) * 1000000;
             else if (strcmp(option, "icon") == 0) {
-                fIconFile = strdup(argument);
+                fIconFile = argument;
 
-                if (get_ref_for_path(fIconFile, &fFileRef) < B_OK) {
+                if (get_ref_for_path(fIconFile.String(), &fFileRef) < B_OK) {
                     fprintf(stderr, "Bad icon path!\n\n");
                     return;
                 }
             } else if (strcmp(option, "onClickApp") == 0)
-                fApp = strdup(argument);
+                fOnClickApp = argument;
             else if (strcmp(option, "onClickFile") == 0) {
                 if (get_ref_for_path(argument, &fFile) != B_OK) {
                     fprintf(stderr, "Bad path for --onClickFile!\n\n");
@@ -170 +155 @@
 
                 fRefs->AddItem(new BEntry(&ref));
             } else if (strcmp(option, "onClickArgv") == 0)
-                fArgv->AddItem(strdup(argument));
+                fArgv->AddItem(new BString(argument));
             else {
                 // Unrecognized option
                 fprintf(stderr, "Unrecognized option --%s\n\n", option);
@@ -188 +173 @@
         }
     }
 
-    // Check for missing arguments
-    if (fAppName == NULL) {
-        fprintf(stderr, "Missing --app argument!\n\n");
-        return;
-    }
-    if (fTitle == NULL) {
-        fprintf(stderr, "Missing --title argument!\n\n");
-        return;
-    }
-
-    fMessage = strdup(argv[index]);
+    fContent = argv[index];
     fHasGoodArguments = true;
 }
 
@@ -208 +183 @@
     fprintf(stderr, "Usage: notify [OPTION]... [MESSAGE]\n"
         "Send notifications to notification_server.\n"
         "  --type <type>\tNotification type,\n"
-        "               \t      <type>: ");
+        "               \t      <type> - \"information\" is assumed by default: ");
 
     for (int32 i = 0; kTypeNames[i]; i++)
         fprintf(stderr, kTypeNames[i + 1] ? "%s|" : "%s\n", kTypeNames[i]);
 
     fprintf(stderr,
-        "  --app <app name>\tApplication name\n"
+        "  --group <group>\tGroup\n"
         "  --title <title>\tMessage title\n"
         "  --messageID <msg id>\tMessage ID\n"
         "  --progress <float>\tProgress, value between 0.0 and 1.0  - if type is set to progress\n"
@@ -256 +231 @@
 {
     if (HasGoodArguments()) {
         BNotification notification(fType);
-        notification.SetApplication(fAppName);
-        notification.SetTitle(fTitle);
-        notification.SetContent(fMessage);
-
-        if (fMsgId != NULL)
+        if (fGroup != "")
+            notification.SetGroup(fGroup);
+        if (fTitle != "")
+            notification.SetTitle(fTitle);
+        if (fContent != "")
+            notification.SetContent(fContent);
+
+        if (fMsgId != "")
             notification.SetMessageID(fMsgId);
 
         if (fType == B_PROGRESS_NOTIFICATION)
             notification.SetProgress(fProgress);
 
-        if (fIconFile != NULL) {
+        if (fIconFile != "") {
             BBitmap* bitmap = _GetBitmap(&fFileRef);
             if (bitmap) {
                 notification.SetIcon(bitmap);
@@ -274 +252 @@
             }
         }
 
-        if (fApp != NULL)
-            notification.SetOnClickApp(fApp);
+        if (fOnClickApp != "")
+            notification.SetOnClickApp(fOnClickApp);
 
         if (fHasFile)
             notification.SetOnClickFile(&fFile);
@@ -289 +267 @@
         }
 
         for (int32 i = 0; void* item = fArgv->ItemAt(i); i++) {
-            const char* arg = (const char*)item;
-            notification.AddOnClickArg(arg);
+            BString* arg = (BString*)item;
+            notification.AddOnClickArg(arg->String());
         }
 
-        status_t ret = be_roster->Notify(notification, fTimeout);
+        status_t ret = notification.Send(fTimeout);
         if (ret != B_OK) {
             fprintf(stderr, "Failed to deliver notification: %s\n",
                 strerror(ret));

src/kits/app/Jamfile

@@ -17 +17 @@
     SubDirC++Flags $(defines) ;
 }
 
+UseLibraryHeaders icon ;
 UsePrivateHeaders shared app interface kernel notification ;
 UsePrivateSystemHeaders ;
 

src/kits/app/Notification.cpp

@@ -4 +4 @@
  *
  * Authors:
  *      Pier Luigi Fiorini, pierluigi.fiorini@gmail.com
- *      Stephan Aßmus <superstippi@gmx.de>
+ *      Stephan Aßmus, superstippi@gmx.de
  */
 
 
@@ -13 +13 @@
 #include <new>
 
 #include <stdlib.h>
-#include <string.h>
+
+#include <notification/Notifications.h>
 
 #include <Bitmap.h>
 #include <Message.h>
 
 
+/*! \brief Creates a notification that's ready to be used.
+
+    \param type Notification type.
+*/
 BNotification::BNotification(notification_type type)
     :
+    BArchivable(),
+    fInitStatus(B_OK),
     fType(type),
+    fProgress(0.0f),
+    fFile(NULL),
+    fBitmap(NULL)
+{
+}
+
+
+/*! \brief Creates a notification that's ready to be used.
+
+    \param archive Archived BNotification object.
+*/
+BNotification::BNotification(BMessage* archive)
+    :
+    BArchivable(archive),
+    fInitStatus(B_OK),
+    fProgress(0.0f),
     fFile(NULL),
     fBitmap(NULL)
 {
+    int32 type;
+    if (archive->FindInt32("_type", &type) == B_OK)
+        fType = (notification_type)type;
+    else
+        fInitStatus = B_ERROR;
+
+    BString group;
+    if (archive->FindString("_group", &group) == B_OK)
+        SetGroup(group);
+
+    BString title;
+    if (archive->FindString("_title", &title) == B_OK)
+        SetTitle(title);
+
+    BString content;
+    if (archive->FindString("_content", &content) == B_OK)
+        SetContent(content);
+
+    BString messageID;
+    if (archive->FindString("_messageID", &messageID) == B_OK)
+        SetMessageID(messageID);
+
+    float progress;
+    if (type == B_PROGRESS_NOTIFICATION
+        && archive->FindFloat("_progress", &progress) == B_OK)
+        SetProgress(progress);
+
+    BString onClickApp;
+    if (archive->FindString("_onClickApp", &onClickApp) == B_OK)
+        SetOnClickApp(onClickApp);
+
+    entry_ref onClickFile;
+    if (archive->FindRef("_onClickFile", &onClickFile) == B_OK)
+        SetOnClickFile(&onClickFile);
+
+    status_t ret = B_OK;
+    BMessage icon;
+    if ((ret = archive->FindMessage("_icon", &icon)) == B_OK) {
+        BBitmap bitmap(&icon);
+        ret = bitmap.InitCheck();
+        if (ret == B_OK)
+            ret = SetIcon(&bitmap);
+    }
 }
 
 
+/*! \brief Standard destructor.
+ */
 BNotification::~BNotification()
 {
     delete fFile;
@@ -41 +109 @@
 }
 
 
+/*! \brief Returns initialization status.
+ */
+status_t
+BNotification::InitCheck() const
+{
+    return fInitStatus;
+}
+
+
+/*! \brief Returns a new BNotification object from @archive.
+
+    Returns a new BNotification object, allocated by new and created
+    with the version of the constructor that takes BMessage archive.
+    However, if the message doesn't contain an archived data for a
+    BNotification object, this method returns NULL.
+
+    \return BNotification object from @archive or NULL if it doesn't
+            contain a valid BNotification object.
+*/
+BArchivable*
+BNotification::Instantiate(BMessage* archive)
+{
+    if (validate_instantiation(archive, "BNotification"))
+        return new(std::nothrow) BNotification(archive);
+
+    return NULL;
+}
+
+
+/*! \brief Archives the BNotification in the BMessages @archive.
+
+    \sa BArchivable::Archive(), Instantiate() static function.
+    \return 
+    - \c B_OK: Everything went fine.
+    - \c Other errors: Archiving has failed.
+*/
+status_t
+BNotification::Archive(BMessage* archive, bool deep) const
+{
+    status_t status = BArchivable::Archive(archive, deep);
+
+    if (status == B_OK)
+        status = archive->AddInt32("_type", (int32)fType);
+
+    if (status == B_OK && Group() != NULL)
+        status = archive->AddString("_group", Group());
+
+    if (status == B_OK && Title() != NULL)
+        status = archive->AddString("_title", Title());
+
+    if (status == B_OK && Content() != NULL)
+        status = archive->AddString("_content", Content());
+
+    if (status == B_OK && MessageID() != NULL)
+        status = archive->AddString("_messageID", MessageID());
+
+    if (status == B_OK && Type() == B_PROGRESS_NOTIFICATION)
+        status = archive->AddFloat("_progress", Progress());
+
+    if (status == B_OK && OnClickApp() != NULL)
+        status = archive->AddString("_onClickApp", OnClickApp());
+
+    if (status == B_OK && OnClickFile() != NULL)
+        status = archive->AddRef("_onClickFile", OnClickFile());
+
+    if (status == B_OK) {
+        for (int32 i = 0; i < CountOnClickRefs(); i++) {
+            status = archive->AddRef("_onClickRef", OnClickRefAt(i));
+            if (status != B_OK)
+                break;
+        }
+    }
+
+    if (status == B_OK) {
+        for (int32 i = 0; i < CountOnClickArgs(); i++) {
+            status = archive->AddString("_onClickArgv", OnClickArgAt(i));
+            if (status != B_OK)
+                break;
+        }
+    }
+
+    if (status == B_OK) {
+        const BBitmap* icon = Icon();
+        if (icon != NULL) {
+            BMessage iconArchive;
+            status = icon->Archive(&iconArchive);
+            if (status == B_OK)
+                archive->AddMessage("_icon", &iconArchive);
+        }
+    }
+
+    return status;
+}
+
+
+/*! \brief Notification's type.
+
+    \return A value of the notification_type enum that represents
+            notification type.
+*/
 notification_type
 BNotification::Type() const
 {
@@ -48 +216 @@
 }
 
 
+/*! \brief Returns notification's group.
+
+    \return Notification's group.
+*/
 const char*
-BNotification::Application() const
+BNotification::Group() const
 {
-    return fAppName;
+    if (fGroup == "")
+        return NULL;
+    return fGroup;
 }
 
 
+/*! \brief Sets notification's group.
+
+    Notifications can be grouped together setting the same group.
+*/
 void
-BNotification::SetApplication(const BString& app)
+BNotification::SetGroup(const BString& group)
 {
-    fAppName = app;
+    fGroup = group;
 }
 
 
+/*! \brief Returns notification's title.
+
+    \return Notification's title.
+*/
 const char*
 BNotification::Title() const
 {
+    if (fTitle == "")
+        return NULL;
     return fTitle;
 }
 
 
+/*! \brief Set notification's title.
+*/
 void
 BNotification::SetTitle(const BString& title)
 {
@@ -76 +262 @@
 }
 
 
+/*! \brief Returns notification's message.
+
+    \return Notification's message.
+*/
 const char*
 BNotification::Content() const
 {
+    if (fContent == "")
+        return NULL;
     return fContent;
 }
 
 
+/*! \brief Sets notification's message.
+*/
 void
 BNotification::SetContent(const BString& content)
 {
@@ -90 +284 @@
 }
 
 
+/*! \brief Returns notification's message identifier.
+
+    \return Notification's message identifier.
+*/
 const char*
 BNotification::MessageID() const
 {
+    if (fID == "")
+        return NULL;
     return fID;
 }
 
 
+/*! \brief Sets notification's message identifier.
+*/
 void
 BNotification::SetMessageID(const BString& id)
 {
@@ -104 +306 @@
 }
 
 
+/*! \brief Returns progress information.
+
+    If notification's type is \c B_PROGRESS_NOTIFICATION, returns a value
+    between 0.0 and 1.0 that represent progress percentage.
+
+    If notification's type is not \c B_PROGRESS_NOTIFICATION, returns -1.
+
+    \return Percentage if notification's type is B_PROGRESS_NOTIFICATION
+            or otherwise -1.
+*/
 float
 BNotification::Progress() const
 {
+    if (fType != B_PROGRESS_NOTIFICATION)
+        return -1;
     return fProgress;
 }
 
 
+/*! \brief Sets progress information.
+
+    Sets progress percentage, this information will be used only
+    if notification's type is \c B_PROGRESS_NOTIFICATION.
+
+    The value of @progress must be between 0.0 and 1.0.
+*/
 void
 BNotification::SetProgress(float progress)
 {
-    fProgress = progress;
+    if (progress < 0)
+        fProgress = 0;
+    else if (progress > 1)
+        fProgress = 1;
+    else
+        fProgress = progress;
 }
 
 
 const char*
 BNotification::OnClickApp() const
 {
+    if (fApp == "")
+        return NULL;
     return fApp;
 }
 
@@ -208 +436 @@
 }
 
 
+/*! \brief Notification's icon.
+
+    \return Notification's icon.
+*/
 const BBitmap*
 BNotification::Icon() const
 {
@@ -215 +447 @@
 }
 
 
+/*! \brief Sets notification's icon.
+
+    Sets notification's icon.
+    This method takes ownership of @icon.
+
+    \param icon Icon
+    \return
+    - \c B_OK: Everything went fine.
+    - \c B_NO_MEMORY: Allocation of @icon copy has failed.
+    - \c Other errors: Creation of @icon copy failed for some reason.
+*/
 status_t
 BNotification::SetIcon(const BBitmap* icon)
 {
@@ -230 +473 @@
     fBitmap = NULL;
     return B_OK;
 }
+
+
+/*! \brief Sends a notification to the notification_server.
+
+    The notification is delivered asynchronously to the notification_server,
+    which will display it according to its settings and filters.
+
+    \param timeout Microseconds after the message fades out.
+    \return
+    - \c B_OK: Everything went fine.
+    - \c B_BAD_PORT_ID: A connection to notification_server could not be
+      established or the server is not up and running anymore.
+    - \c Other errors: Building the message from the notification failed.
+*/
+status_t
+BNotification::Send(bigtime_t timeout)
+{
+    BMessage msg(kNotificationMessage);
+
+    // Archive notification
+    status_t ret = Archive(&msg);
+
+    // Custom time out
+    if (ret == B_OK && timeout > 0)
+        ret = msg.AddInt64("timeout", timeout);
+
+    // Send message
+    if (ret == B_OK) {
+        BMessenger server(kNotificationServerSignature);
+        ret = server.SendMessage(&msg);
+    }
+
+    return ret;
+}

src/kits/app/Roster.cpp

@@ -36 +36 @@
 #include <Mime.h>
 #include <Node.h>
 #include <NodeInfo.h>
-#include <Notification.h>
-#include <notification/Notifications.h>
 #include <OS.h>
 #include <Path.h>
 #include <Query.h>
@@ -1653 +1651 @@
         DBG(OUT("WARNING: BRoster::AddToRecentDocuments() failed with error 0x%lx\n", err));
 }
 
-/*! \brief Sends a notification to the notification_server.
-
-    The notification is delivered asynchronously to the notification_server,
-    which will displays it according to its settings and filters.
-
-    \param notification Notification message.
-    \param timeout Seconds after the message fades out.
-    \return
-    - \c B_OK: Everything went fine.
-    - \c B_BAD_PORT_ID: A connection to notification_server could not be
-      established or the server is not up and running anymore.
-    - \c Other errors: Building the message from the notification failed.
-*/
-status_t
-BRoster::Notify(const BNotification& notification, bigtime_t timeout) const
-{
-    // TODO: Add BArchivable support to BNotification and use it here.
-    BMessage msg(kNotificationMessage);
-    status_t ret = msg.AddInt32("type", (int32)notification.Type());
-    if (ret == B_OK)
-        ret = msg.AddString("app", notification.Application());
-    if (ret == B_OK)
-        ret = msg.AddString("title", notification.Title());
-    if (ret == B_OK)
-        ret = msg.AddString("content", notification.Content());
-
-    if (ret == B_OK && notification.MessageID() != NULL)
-        ret = msg.AddString("messageID", notification.MessageID());
-
-    if (ret == B_OK && notification.Type() == B_PROGRESS_NOTIFICATION)
-        ret = msg.AddFloat("progress", notification.Progress());
-
-    if (ret == B_OK && notification.OnClickApp() != NULL)
-        ret = msg.AddString("onClickApp", notification.OnClickApp());
-    if (ret == B_OK && notification.OnClickFile() != NULL)
-        ret = msg.AddRef("onClickFile", notification.OnClickFile());
-
-    if (ret == B_OK) {
-        for (int32 i = 0; i < notification.CountOnClickRefs(); i++) {
-            ret = msg.AddRef("onClickRef", notification.OnClickRefAt(i));
-            if (ret != B_OK)
-                break;
-        }
-    }
-
-    if (ret == B_OK) {
-        for (int32 i = 0; i < notification.CountOnClickArgs(); i++) {
-            ret = msg.AddString("onClickArgv", notification.OnClickArgAt(i));
-            if (ret != B_OK)
-                break;
-        }
-    }
-
-    if (ret == B_OK) {
-        const BBitmap* icon = notification.Icon();
-        if (icon != NULL) {
-            BMessage archive;
-            ret = icon->Archive(&archive);
-            if (ret == B_OK)
-                ret = msg.AddMessage("icon", &archive);
-        }
-    }
-
-    // Custom time out
-    if (ret == B_OK && timeout > 0)
-        ret = msg.AddInt64("timeout", timeout);
-
-    // Send message
-    if (ret == B_OK) {
-        BMessenger server(kNotificationServerSignature);
-        ret = server.SendMessage(&msg);
-    }
-
-    return ret;
-}
-
-
 //  #pragma mark - Private or reserved
 
 

src/kits/notification/AppUsage.cpp

@@ -27 +27 @@
 }
 
 
-AppUsage::AppUsage(entry_ref ref, const char* name, bool allow)
+AppUsage::AppUsage(const char* name, bool allow)
     :
-    fRef(ref),
     fName(name),
     fAllow(allow)
 {   
@@ -38 +37 @@
 
 AppUsage::~AppUsage()
 {
-    notify_t::iterator nIt;
+    notification_t::iterator nIt;
     for (nIt = fNotifications.begin(); nIt != fNotifications.end(); nIt++)
         delete nIt->second;
 }
@@ -55 +54 @@
 AppUsage::Flatten(void* buffer, ssize_t numBytes) const
 {
     BMessage msg;
-    msg.AddString("app_name", fName);
-    msg.AddRef("app_ref", &fRef);
-    msg.AddBool("app_allow", fAllow);
+    msg.AddString("signature", fName);
+    msg.AddBool("allow", fAllow);
 
-    notify_t::const_iterator nIt;
+    notification_t::const_iterator nIt;
     for (nIt = fNotifications.begin(); nIt != fNotifications.end(); nIt++)
-        msg.AddFlat("notify", nIt->second);
+        msg.AddFlat("notification", nIt->second);
 
     if (numBytes < msg.FlattenedSize())
         return B_ERROR;
@@ -74 +72 @@
 AppUsage::FlattenedSize() const
 {
     BMessage msg;
-    msg.AddString("app_name", fName);
-    msg.AddRef("app_ref", &fRef);
-    msg.AddBool("app_allow", fAllow);
+    msg.AddString("signature", fName);
+    msg.AddBool("allow", fAllow);
 
-    notify_t::const_iterator nIt;
+    notification_t::const_iterator nIt;
     for (nIt = fNotifications.begin(); nIt != fNotifications.end(); nIt++)
-        msg.AddFlat("notify", nIt->second);
+        msg.AddFlat("notification", nIt->second);
 
     return msg.FlattenedSize();
 }
@@ -113 +110 @@
     status = msg.Unflatten((const char*)buffer);
 
     if (status == B_OK) {
-        msg.FindString("app_name", &fName);
-        msg.FindRef("app_ref", &fRef);
-        msg.FindBool("app_allow", &fAllow);
+        msg.FindString("signature", &fName);
+        msg.FindBool("allow", &fAllow);
 
         type_code type;
         int32 count = 0;
 
-        status = msg.GetInfo("notify", &type, &count);
+        status = msg.GetInfo("notification", &type, &count);
         if (status != B_OK)
             return status;
 
         for (int32 i = 0; i < count; i++) {
-            NotificationReceived *notify = new NotificationReceived();
-            msg.FindFlat("notify", i, notify);
-            fNotifications[notify->Title()] = notify;
+            NotificationReceived *notification = new NotificationReceived();
+            msg.FindFlat("notification", i, notification);
+            fNotifications[notification->Title()] = notification;
         }
 
         status = B_OK;
@@ -137 +133 @@
 }
 
                         
-entry_ref
-AppUsage::Ref()
-{
-    return fRef;
-}
-
-
 const char*
 AppUsage::Name()
 {
@@ -157 +146 @@
     bool allowed = fAllow;
 
     if (allowed) {
-        notify_t::iterator nIt = fNotifications.find(title);
+        notification_t::iterator nIt = fNotifications.find(title);
         if (nIt == fNotifications.end()) {
             allowed = true;     
             fNotifications[title] = new NotificationReceived(title, type);
@@ -182 +171 @@
 NotificationReceived*
 AppUsage::NotificationAt(int32 index)
 {
-    notify_t::iterator nIt = fNotifications.begin();
+    notification_t::iterator nIt = fNotifications.begin();
     for (int32 i = 0; i < index; i++)
         nIt++;
 

src/kits/notification/Notifications.cpp

@@ -3 +3 @@
  * Distributed under the terms of the MIT License.
  */
 
-
 #include <Notifications.h>
 
 
@@ -20 +19 @@
 // Display settings
 const char* kWidthName = "width";
 const char* kIconSizeName = "icon size";
-const char* kLayoutName = "layout";
-

src/preferences/notifications/DisplayView.cpp

@@ -49 +49 @@
     fIconSize->SetLabelFromMarked(true);
     fIconSizeField = new BMenuField(_T("Icon size:"), fIconSize);
 
-    // Title position
-    fTitlePosition = new BMenu("titlePosition");
-    fTitlePosition->AddItem(new BMenuItem(_T("Above icon"),
-        new BMessage(kSettingChanged)));
-    fTitlePosition->AddItem(new BMenuItem(_T("Right of icon"),
-        new BMessage(kSettingChanged)));
-    fTitlePosition->SetLabelFromMarked(true);
-    fTitlePositionField = new BMenuField(_T("Title position:"), fTitlePosition);
-
     // Load settings
     Load();
 
@@ -70 +61 @@
         .Add(fWindowWidth->CreateTextViewLayoutItem(), 1, 0)
         .Add(fIconSizeField->CreateLabelLayoutItem(), 0, 1)
         .Add(fIconSizeField->CreateMenuBarLayoutItem(), 1, 1)
-        .Add(fTitlePositionField->CreateLabelLayoutItem(), 0, 2)
-        .Add(fTitlePositionField->CreateMenuBarLayoutItem(), 1, 2)
-        .Add(BSpaceLayoutItem::CreateGlue(), 0, 3, 2, 1)
+        .Add(BSpaceLayoutItem::CreateGlue(), 0, 2, 2, 1)
     );
 }
 
@@ -82 +71 @@
 {
     fWindowWidth->SetTarget(this);
     fIconSize->SetTargetForItems(this);
-    fTitlePosition->SetTargetForItems(this);
 }
 
 
@@ -146 +134 @@
     if (item)
         item->SetMarked(true);
 
-    infoview_layout layout;
-    if (settings.FindInt32(kLayoutName, &setting) != B_OK)
-        layout = kDefaultLayout;
-    else {
-        switch (setting) {
-            case 0:
-                layout = TitleAboveIcon;
-                break;
-            case 1:
-                layout = AllTextRightOfIcon;
-                break;
-            default:
-                layout = kDefaultLayout;
-        }
-    }
-    item = fTitlePosition->ItemAt(layout);
-    if (item)
-        item->SetMarked(true);
-
     return B_OK;
 }
 
@@ -195 +164 @@
     }
     settings.AddInt32(kIconSizeName, (int32)iconSize);
 
-    int32 layout = fTitlePosition->IndexOf(fTitlePosition->FindMarked());
-    if (layout == B_ERROR)
-        layout = (int32)kDefaultLayout;
-    settings.AddInt32(kLayoutName, layout);
-
     // Save settings file
     BFile file(path.Path(), B_WRITE_ONLY | B_CREATE_FILE | B_ERASE_FILE);
     status_t ret = settings.Flatten(&file);

src/preferences/notifications/DisplayView.h

@@ -28 +28 @@
             BTextControl*   fWindowWidth;
             BMenu*          fIconSize;
             BMenuField*     fIconSizeField;
-            BMenu*          fTitlePosition;
-            BMenuField*     fTitlePositionField;
 
 };
 

src/servers/notification/AppGroupView.cpp

@@ -13 +13 @@
 
 #include <algorithm>
 
+#include <GroupLayout.h>
+#include <GroupView.h>
+
 #include "AppGroupView.h"
 
 #include "NotificationWindow.h"
@@ -21 +24 @@
 
 AppGroupView::AppGroupView(NotificationWindow* win, const char* label)
     :
-    BView(BRect(0, 0, win->ViewWidth(), 1), label, B_FOLLOW_LEFT_RIGHT,
-        B_WILL_DRAW|B_FULL_UPDATE_ON_RESIZE|B_FRAME_EVENTS),
+    BBox(B_FANCY_BORDER, (fView = new BGroupView(B_VERTICAL, 10))),
     fLabel(label),
     fParent(win),
     fCollapsed(false)
 {
-    Show();
+    // If no group was specified we don't have any border or label
+    if (label == NULL)
+        SetBorder(B_NO_BORDER);
+    else
+        SetLabel(label);
 }
 
 
@@ -37 +43 @@
 
 
 void
-AppGroupView::AttachedToWindow()
-{
-    SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
-    SetLowColor(ui_color(B_PANEL_BACKGROUND_COLOR));
-    SetHighColor(ui_color(B_PANEL_TEXT_COLOR));
-}
-
-
-void
-AppGroupView::Draw(BRect updateRect)
-{
-    FillRect(Bounds(), B_SOLID_LOW);
-
-    BString label = fLabel;
-    if (fCollapsed)
-        label << " (" << fInfo.size() << ")";
-
-    font_height fh;
-    be_bold_font->GetHeight(&fh);
-    float labelOffset = fh.ascent + fh.leading;
-
-    BRect borderRect = Bounds().InsetByCopy(kEdgePadding, kEdgePadding);
-    borderRect.top = labelOffset;
-
-    BRect textRect = borderRect;
-    textRect.left = kEdgePadding * 2;
-    textRect.right = textRect.left + be_bold_font->StringWidth(label.String())
-        + (kEdgePadding * 3);
-    textRect.bottom = labelOffset;
-
-    BRect closeCross = fCloseRect;
-    closeCross.InsetBy(kSmallPadding, kSmallPadding);
-
-    rgb_color detailCol = ui_color(B_CONTROL_BORDER_COLOR);
-    detailCol = tint_color(detailCol, B_LIGHTEN_2_TINT);
-    // detailCol = tint_color(detailCol, B_LIGHTEN_1_TINT);
-
-    if (fCollapsed) {
-        PushState();
-            SetFont(be_bold_font);
-            SetPenSize(kPenSize);
-            float linePos = textRect.top + textRect.Height() / 2;
-
-            // Draw the line to the expand widget           
-            PushState();
-                SetHighColor(detailCol);                
-                StrokeLine(BPoint(kEdgePadding, linePos), BPoint(fCollapseRect.left, linePos));
-            PopState();
-            
-            // Draw the expand widget
-            PushState();
-                SetHighColor(detailCol);
-                StrokeRoundRect(fCollapseRect, kSmallPadding, kSmallPadding);
-                
-                BPoint expandHorStart(fCollapseRect.left + kSmallPadding, fCollapseRect.Height() / 2 + fCollapseRect.top);
-                BPoint expandHorEnd(fCollapseRect.right - kSmallPadding, fCollapseRect.Height() / 2 + fCollapseRect.top);           
-                StrokeLine(expandHorStart, expandHorEnd);
-                
-                BPoint expandVerStart(fCollapseRect.Width() / 2 + fCollapseRect.left, fCollapseRect.top + kSmallPadding);
-                BPoint expandVerEnd(fCollapseRect.Width() / 2 + fCollapseRect.left, fCollapseRect.bottom - kSmallPadding);              
-                StrokeLine(expandVerStart, expandVerEnd);
-            PopState();
-            
-            // Draw the app title
-            DrawString(label.String(), BPoint(fCollapseRect.right + kEdgePadding, labelOffset + kEdgePadding));
-            
-            // Draw the line from the label to the close widget
-            PushState();
-                SetHighColor(detailCol);
-                
-                BPoint lineSeg2Start(textRect.right + kSmallPadding / 2, linePos);
-                BPoint lineSeg2End(fCloseRect.left, linePos);
-                StrokeLine(lineSeg2Start, lineSeg2End);
-            PopState();
-
-            // Draw the dismiss widget
-            PushState();
-                SetHighColor(detailCol);
-
-                StrokeRoundRect(fCloseRect, kSmallPadding, kSmallPadding);
-
-                StrokeLine(closeCross.LeftTop(), closeCross.RightBottom());
-                StrokeLine(closeCross.RightTop(), closeCross.LeftBottom());
-            PopState();
-
-            // Draw the line from the dismiss widget
-            PushState();
-                SetHighColor(detailCol);
-
-                BPoint lineSeg3Start(fCloseRect.right, linePos);
-                BPoint lineSeg3End(borderRect.right, linePos);
-                StrokeLine(lineSeg3Start, lineSeg3End);
-            PopState();
-
-        PopState();
-    } else {
-        PushState();
-            SetFont(be_bold_font);
-            SetPenSize(kPenSize);
-
-            // Draw the border
-            PushState();
-                SetHighColor(detailCol);
-                // StrokeRoundRect(borderRect, kEdgePadding, kEdgePadding * 2);
-                StrokeRect(borderRect);
-            PopState();
-
-            FillRect(textRect, B_SOLID_LOW);
-
-            // Draw the collapse widget
-            PushState();
-                SetHighColor(detailCol);
-                StrokeRoundRect(fCollapseRect, kSmallPadding, kSmallPadding);
-
-                BPoint expandHorStart(fCollapseRect.left + kSmallPadding, fCollapseRect.Height() / 2 + fCollapseRect.top);
-                BPoint expandHorEnd(fCollapseRect.right - kSmallPadding, fCollapseRect.Height() / 2 + fCollapseRect.top);
-
-                StrokeLine(expandHorStart, expandHorEnd);
-            PopState();
-
-            // Draw the dismiss widget
-            PushState();
-                SetHighColor(detailCol);            
-                FillRect(fCloseRect, B_SOLID_LOW);
-
-                StrokeRoundRect(fCloseRect, kSmallPadding, kSmallPadding);
-
-                StrokeLine(closeCross.LeftTop(), closeCross.RightBottom());
-                StrokeLine(closeCross.RightTop(), closeCross.LeftBottom());
-            PopState();
-
-            // Draw the label
-            DrawString(label.String(), BPoint(fCollapseRect.right + kEdgePadding, labelOffset + kEdgePadding));
-        PopState();
-    }
-
-    Sync(); 
-}
-
-
-void
 AppGroupView::MouseDown(BPoint point)
 {
     bool changed = false;
+
+    // User is closing all the children
     if (fCloseRect.Contains(point)) {
         changed = true;
 
         int32 children = fInfo.size();
+
         for (int32 i = 0; i < children; i++) {
-            fInfo[i]->RemoveSelf();
+            fView->GetLayout()->RemoveView(fInfo[i]);
             delete fInfo[i];
         }
+
         fInfo.clear();
     }
 
+    // User is collapsing this group box
     if (fCollapseRect.Contains(point)) {
         fCollapsed = !fCollapsed;
         changed = true;
     }
 
-    if (changed) {
-        ResizeViews();
-        Invalidate();
-    }
-}
-
-
-void
-AppGroupView::GetPreferredSize(float* width, float* height)
-{
-    font_height fh;
-    be_bold_font->GetHeight(&fh);
-
-    float h = fh.ascent + fh.leading + fh.leading;
-    h += kEdgePadding * 2; // Padding between top and bottom of label
-
-    if (!fCollapsed) {
-        int32 children = fInfo.size();
-
-        for (int32 i = 0; i < children; i++) {
-            float childHeight = 0;
-            float childWidth = 0;
-            
-            fInfo[i]->GetPreferredSize(&childWidth, &childHeight);
-            
-            h += childHeight;
-        }
-    }
-
-    h += kEdgePadding;
-
-    *width = fParent->ViewWidth();
-    *height = h;
+    if (changed)
+        _ResizeViews();
 }
 
 
@@ -247 +86 @@
 
             if (vIt != fInfo.end()) {
                 fInfo.erase(vIt);
-                view->RemoveSelf();
+                fView->GetLayout()->RemoveView(view);
                 delete view;
             }
 
-            ResizeViews();
-            Invalidate();
+            if (Window() != NULL)
+                Window()->PostMessage(msg);
 
-            // When all the views are destroy, save app filters
-            if (fInfo.size() == 0)
-                dynamic_cast<NotificationWindow*>(Window())->SaveAppFilters();
+            _ResizeViews();
             break;
         }
         default:
@@ -265 +102 @@
 }
 
 
+bool
+AppGroupView::HasChildren()
+{
+    return !fInfo.empty();
+}
+
+
 void
 AppGroupView::AddInfo(NotificationView* view)
 {
     BString id = view->MessageID();
+    bool found = false;
+
     if (id.Length() > 0) {
         int32 children = fInfo.size();
-        bool found = false;
 
         for (int32 i = 0; i < children; i++) {
-            if (fInfo[i]->HasMessageID(id.String())) {
-                fInfo[i]->RemoveSelf();
+            // Replace a child with the same message identifier
+            if (id == fInfo[i]->MessageID()) {
+                fView->GetLayout()->RemoveView(fInfo[i]);
                 delete fInfo[i];
-                
+
                 fInfo[i] = view;
                 found = true;
-                
                 break;
             }
         }
+    }
 
-        if (!found)
-            fInfo.push_back(view);
-    } else
+    // Add child to the list if it's a new one
+    if (!found)
         fInfo.push_back(view);
 
+#if 0
     if (fParent->IsHidden())
         fParent->Show();
+#endif
+
+    // Add the new child
+    fView->GetLayout()->AddView(view);
+
+    // Show this group and child if hidden
     if (IsHidden())
         Show();
     if (view->IsHidden())
         view->Show();
 
-    AddChild(view);
-
-    ResizeViews();
-    Invalidate();
+    _ResizeViews();
 }
 
 
 void
-AppGroupView::ResizeViews()
+AppGroupView::_ResizeViews()
 {
-    font_height fh;
-    be_bold_font->GetHeight(&fh);
-
-    float offset = fh.ascent + fh.leading + fh.descent;
     int32 children = fInfo.size();
 
     if (!fCollapsed) {
-        offset += kEdgePadding + kPenSize;
-
         for (int32 i = 0; i < children; i++) {
-            fInfo[i]->ResizeToPreferred();
-            fInfo[i]->MoveTo(kEdgePadding + kPenSize, offset);
-            
-            offset += fInfo[i]->Bounds().Height();
             if (fInfo[i]->IsHidden())
                 fInfo[i]->Show();
-            fInfo[i]->SetPosition(false, false);
-        };
+        }
     } else {
         for (int32 i = 0; i < children; i++)
             if (!fInfo[i]->IsHidden())
                 fInfo[i]->Hide();
     }
 
-    if (children == 1)
-        fInfo[0]->SetPosition(true, true);
-    else if (children > 1) {
-        fInfo[0]->SetPosition(true, false);
-        fInfo[children - 1]->SetPosition(false, true);
-    }
-
-    ResizeTo(fParent->ViewWidth(), offset);
+#if 0
     float labelOffset = fh.ascent + fh.leading;
 
     BRect borderRect = Bounds().InsetByCopy(kEdgePadding, kEdgePadding);
@@ -354 +185 @@
     fCloseRect.left = fCloseRect.right - kCloseSize;
     fCloseRect.bottom = fCloseRect.top + kCloseSize;
     fCloseRect.OffsetTo(fCloseRect.left, kEdgePadding * 1.5);
-
-    fParent->ResizeAll();
-}
-
-
-bool
-AppGroupView::HasChildren()
-{
-    return !fInfo.empty();
+#endif
 }

src/servers/notification/AppGroupView.h

@@ -1 +1 @@
 /*
- * Copyright 2005-2008, Mikael Eiman.
- * Copyright 2005-2008, Michael Davidson.
+ * Copyright 2010, Haiku, Inc. All Rights Reserved.
+ * Copyright 2008-2009, Pier Luigi Fiorini. All Rights Reserved.
+ * Copyright 2004-2008, Michael Davidson. All Rights Reserved.
+ * Copyright 2004-2007, Mikael Eiman. All Rights Reserved.
  * Distributed under the terms of the MIT License.
- *
- * Authors:
- *              Mikael Eiman <mikael@eiman.tv>
- *              Michael Davidson <slaad@bong.com.au>
  */
-
-#ifndef APPGROUPVIEW_H
-#define APPGROUPVIEW_H
+#ifndef _APP_GROUP_VIEW_H
+#define _APP_GROUP_VIEW_H
 
 #include <vector>
 
+#include <Box.h>
 #include <String.h>
-#include <View.h>
+
+class BGroupView;
 
 class NotificationWindow;
 class NotificationView;
 
-typedef std::vector<NotificationView *> infoview_t;
-
-class AppGroupView : public BView {
-    public:
-                            AppGroupView(NotificationWindow *win, const char *label);
-                            ~AppGroupView(void);
-    
-        // Hooks
-        void                AttachedToWindow(void);
-        void                Draw(BRect bounds);
-        void                MouseDown(BPoint point);
-        void                GetPreferredSize(float *width, float *height);
-        void                MessageReceived(BMessage *msg);
-    
-        // Public
-        void                AddInfo(NotificationView *view);
-        void                ResizeViews(void);
-        bool                HasChildren(void);
-    
-    private:
-        BString             fLabel;
-        NotificationWindow          *fParent;
-        infoview_t          fInfo;
-        bool                fCollapsed;
-        BRect               fCloseRect;
-        BRect               fCollapseRect;
+typedef std::vector<NotificationView*> infoview_t;
+
+class AppGroupView : public BBox {
+public:
+                                AppGroupView(NotificationWindow* win, const char* label);
+                                ~AppGroupView();
+
+    virtual void                MouseDown(BPoint point);
+    virtual void                MessageReceived(BMessage* msg);
+
+            bool                HasChildren();
+
+            void                AddInfo(NotificationView* view);
+
+private:
+            void                _ResizeViews();
+
+            BString             fLabel;
+            NotificationWindow* fParent;
+            BGroupView*         fView;
+            infoview_t          fInfo;
+            bool                fCollapsed;
+            BRect               fCloseRect;
+            BRect               fCollapseRect;
 };
 
-#endif
+#endif  // _APP_GROUP_VIEW_H

src/servers/notification/Jamfile

@@ -1 +1 @@
 SubDir HAIKU_TOP src servers notification ;
 
 UsePrivateHeaders notification ;
-UseLibraryHeaders icon ;
 
 Server notification_server :
     AppGroupView.cpp
-    BorderView.cpp
     NotificationServer.cpp
     NotificationView.cpp
     NotificationWindow.cpp
-    : be $(TARGET_LIBSTDC++) libicon.a libnotification.a
+    : be translation $(TARGET_LIBSTDC++) libnotification.a
     : notification_server.rdef
 ;
 
-Depends notification_server : libicon.a ;
 Depends notification_server : libnotification.a ;

src/servers/notification/NotificationServer.cpp

@@ -24 +24 @@
 NotificationServer::NotificationServer()
     : BApplication(kNotificationServerSignature)
 {
-    fWindow = new NotificationWindow();
 }
 
 
@@ -34 +33 @@
 
 
 void
+NotificationServer::ReadyToRun()
+{
+    fWindow = new NotificationWindow();
+}
+
+
+void
 NotificationServer::MessageReceived(BMessage* message)
 {
     switch (message->what) {
@@ -61 +67 @@
 }
 
 
-bool
-NotificationServer::QuitRequested()
-{
-    if (fWindow && fWindow->Lock()) {
-        fWindow->Quit();
-        fWindow = NULL;
-    }
-    return true;
-}
-
-
 status_t
 NotificationServer::GetSupportedSuites(BMessage* msg)
 {
@@ -110 +105 @@
         add_system_beep_event(kSoundNames[i++], 0);
 
     // Start!
-    NotificationServer* server = new NotificationServer();
-    server->Run();
+    NotificationServer server;
+    server.Run();
 
     return 0;
 }

src/servers/notification/NotificationServer.h

@@ -14 +14 @@
                             NotificationServer();
     virtual                 ~NotificationServer();
 
+    virtual void            ReadyToRun();
     virtual void            MessageReceived(BMessage* message);
-    virtual bool            QuitRequested();
 
     virtual status_t        GetSupportedSuites(BMessage* msg);
     virtual BHandler*       ResolveSpecifier(BMessage* msg, int32 index, BMessage* spec,

src/servers/notification/NotificationView.cpp

@@ -9 +9 @@
  *      Michael Davidson, slaad@bong.com.au
  *      Mikael Eiman, mikael@eiman.tv
  *      Pier Luigi Fiorini, pierluigi.fiorini@gmail.com
- *      Stephan Aßmus <superstippi@gmx.de>
+ *      Stephan Aßmus, superstippi@gmx.de
  */
 
-#include <stdlib.h>
-
-#include <Font.h>
-#include <IconUtils.h>
+#include <ControlLook.h>
+#include <LayoutUtils.h>
 #include <Messenger.h>
-#include <Picture.h>
-#include <PropertyInfo.h>
-#include <Region.h>
-#include <Resources.h>
+#include <Path.h>
 #include <Roster.h>
-#include <StringView.h>
-#include <TranslationUtils.h>
 
 #include "NotificationView.h"
 #include "NotificationWindow.h"
 
-const char* kSmallIconAttribute = "BEOS:M:STD_ICON";
-const char* kLargeIconAttribute = "BEOS:L:STD_ICON";
-const char* kIconAttribute      = "BEOS:ICON";
-
 property_info message_prop_list[] = {
-    { "type", {B_GET_PROPERTY, B_SET_PROPERTY, 0},
-        {B_DIRECT_SPECIFIER, 0}, "get the notification type"},
-    { "app", {B_GET_PROPERTY, B_SET_PROPERTY, 0},
-        {B_DIRECT_SPECIFIER, 0}, "get notification's app"},
-    { "title", {B_GET_PROPERTY, B_SET_PROPERTY, 0},
-        {B_DIRECT_SPECIFIER, 0}, "get notification's title"},
-    { "content", {B_GET_PROPERTY, B_SET_PROPERTY, 0},
-        {B_DIRECT_SPECIFIER, 0}, "get notification's contents"},
-    { "icon", {B_GET_PROPERTY, 0},
-        {B_DIRECT_SPECIFIER, 0}, "get icon as an archived bitmap"},
-    { "progress", {B_GET_PROPERTY, B_SET_PROPERTY, 0},
-        {B_DIRECT_SPECIFIER, 0}, "get the progress (between 0.0 and 1.0)"},
-    { NULL }
+    {
+        "type",
+        { B_GET_PROPERTY, B_SET_PROPERTY, 0 },
+        { B_DIRECT_SPECIFIER, 0 },
+        "get the notification type"
+    },
+    {
+        "group",
+        { B_GET_PROPERTY, B_SET_PROPERTY, 0 },
+        { B_DIRECT_SPECIFIER, 0 },
+        "get notification's group"
+    },
+    {
+        "title",
+        { B_GET_PROPERTY, B_SET_PROPERTY, 0 },
+        { B_DIRECT_SPECIFIER, 0 },
+        "get notification's title"
+    },
+    {
+        "content",
+        { B_GET_PROPERTY, B_SET_PROPERTY, 0 },
+        { B_DIRECT_SPECIFIER, 0 },
+        "get notification's contents"
+    },
+    {
+        "icon",
+        { B_GET_PROPERTY, 0 },
+        { B_DIRECT_SPECIFIER, 0 },
+        "get icon as an archived bitmap"
+    },
+    {
+        "progress",
+        { B_GET_PROPERTY, B_SET_PROPERTY, 0 },
+        { B_DIRECT_SPECIFIER, 0 },
+        "get the progress (between 0.0 and 1.0)"
+    },
+    { 0, { 0 }, { 0 }, 0 }
 };
 
 
 NotificationView::NotificationView(NotificationWindow* win,
-    notification_type type, const char* app, const char* title, const char* text,
-    BMessage* details)
+    BNotification* notification, bigtime_t timeout)
     :
-    BView(BRect(0, 0, win->ViewWidth(), 1), "NotificationView",
-        B_FOLLOW_LEFT_RIGHT, B_WILL_DRAW | B_FULL_UPDATE_ON_RESIZE
+    BView("NotificationView", B_WILL_DRAW | B_FULL_UPDATE_ON_RESIZE
         | B_FRAME_EVENTS),
     fParent(win),
-    fType(type),
+    fNotification(notification),
+    fTimeout(timeout),
     fRunner(NULL),
-    fProgress(0.0f),
-    fMessageID(""),
-    fDetails(details),
-    fBitmap(NULL),
-    fIsFirst(false),
-    fIsLast(false)
+    fBitmap(NULL)
 {
-    BMessage iconMsg;
-    if (fDetails->FindMessage("icon", &iconMsg) == B_OK)
-        fBitmap = new BBitmap(&iconMsg);
-
-    if (!fBitmap)
-        _LoadIcon();
-
-    const char* messageID = NULL;
-    if (fDetails->FindString("messageID", &messageID) == B_OK)
-        fMessageID = messageID;
+    if (fNotification->Icon() != NULL)
+        fBitmap = new BBitmap(fNotification->Icon());
 
-    if (fDetails->FindFloat("progress", &fProgress) != B_OK)
-        fProgress = 0.0f;
+    if (fTimeout <= 0)
+        fTimeout = fParent->Timeout() * 1000000;
 
-    // Progress is between 0 and 1
-    if (fProgress < 0.0f)
-        fProgress = 0.0f;
-    if (fProgress > 1.0f)
-        fProgress = 1.0f;
+    SetText();
 
-    SetText(app, title, text);
-    ResizeToPreferred();
-
-    switch (type) {
+    switch (fNotification->Type()) {
         case B_IMPORTANT_NOTIFICATION:
             SetViewColor(255, 255, 255);
             SetLowColor(255, 255, 255);
@@ -101 +93 @@
         default:
             SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
             SetLowColor(ui_color(B_PANEL_BACKGROUND_COLOR));
-            break;
     }
 }
 
@@ -109 +100 @@
 NotificationView::~NotificationView()
 {
     delete fRunner;
-    delete fDetails;
     delete fBitmap;
+    delete fNotification;
 
     LineInfoList::iterator lIt;
     for (lIt = fLines.begin(); lIt != fLines.end(); lIt++)
@@ -123 +114 @@
 {
     BMessage msg(kRemoveView);
     msg.AddPointer("view", this);
-    bigtime_t timeout = -1;
 
-    if (fDetails->FindInt64("timeout", &timeout) != B_OK)
-        timeout = fParent->Timeout() * 1000000;
-
-    if (timeout > 0)
-        fRunner = new BMessageRunner(BMessenger(Parent()), &msg, timeout, 1);
+    fRunner = new BMessageRunner(BMessenger(Parent()), &msg, fTimeout, 1);
 }
 
 
@@ -151 +137 @@
 
             if (msgOkay) {
                 if (strcmp(property, "type") == 0)
-                    reply.AddInt32("result", fType);
+                    reply.AddInt32("result", fNotification->Type());
 
-                if (strcmp(property, "app") == 0)
-                    reply.AddString("result", fApp);
+                if (strcmp(property, "group") == 0)
+                    reply.AddString("result", fNotification->Group());
 
                 if (strcmp(property, "title") == 0)
-                    reply.AddString("result", fTitle);
+                    reply.AddString("result", fNotification->Title());
 
                 if (strcmp(property, "content") == 0)
-                    reply.AddString("result", fText);
+                    reply.AddString("result", fNotification->Content());
 
                 if (strcmp(property, "progress") == 0)
-                    reply.AddFloat("result", fProgress);
+                    reply.AddFloat("result", fNotification->Progress());
 
                 if ((strcmp(property, "icon") == 0) && fBitmap) {
                     BMessage archive;
@@ -193 +179 @@
                 msgOkay = false;
 
             if (msgOkay) {
-                if (strcmp(property, "app") == 0)
-                    msg->FindString("data", &fApp);
+                const char* value = NULL;
+
+                if (strcmp(property, "group") == 0)
+                    if (msg->FindString("data", &value) == B_OK)
+                        fNotification->SetGroup(value);
 
                 if (strcmp(property, "title") == 0)
-                    msg->FindString("data", &fTitle);
+                    if (msg->FindString("data", &value) == B_OK)
+                        fNotification->SetTitle(value);
 
                 if (strcmp(property, "content") == 0)
-                    msg->FindString("data", &fText);
+                    if (msg->FindString("data", &value) == B_OK)
+                        fNotification->SetContent(value);
 
                 if (strcmp(property, "icon") == 0) {
                     BMessage archive;
@@ -210 +201 @@
                     }
                 }
 
-                SetText(Application(), Title(), Text());
+                SetText();
                 Invalidate();
 
                 reply.AddInt32("error", B_OK);
@@ -222 +213 @@
             msg->SendReply(&reply);
             break;
         }
-        case kRemoveView:
-        {
-            BMessage remove(kRemoveView);
-            remove.AddPointer("view", this);
-            BMessenger msgr(Window());
-            msgr.SendMessage( &remove );
-            break;
-        }
         default:
             BView::MessageReceived(msg);
     }
@@ -237 +220 @@
 
 
 void
-NotificationView::GetPreferredSize(float* w, float* h)
-{
-    // Parent width, minus the edge padding, minus the pensize
-    *w = fParent->ViewWidth() - (kEdgePadding * 2) - (kPenSize * 2);
-    *h = fHeight;
-
-    if (fType == B_PROGRESS_NOTIFICATION) {
-        font_height fh;
-        be_plain_font->GetHeight(&fh);
-        float fontHeight = fh.ascent + fh.descent + fh.leading;
-        *h += (kSmallPadding * 2) + (kEdgePadding * 1) + fontHeight;
-    }
-}
-
-
-void
 NotificationView::Draw(BRect updateRect)
 {
     BRect progRect;
 
     // Draw progress background
-    if (fType == B_PROGRESS_NOTIFICATION) {
-        PushState();
-
+    if (fNotification->Type() == B_PROGRESS_NOTIFICATION) {
         font_height fh;
         be_plain_font->GetHeight(&fh);
+
         float fontHeight = fh.ascent + fh.descent + fh.leading;
 
         progRect = Bounds();
         progRect.InsetBy(kEdgePadding, kEdgePadding);
         progRect.top = progRect.bottom - (kSmallPadding * 2) - fontHeight;
-        StrokeRect(progRect);
 
-        BRect barRect = progRect;       
-        barRect.InsetBy(1.0, 1.0);
-        barRect.right *= fProgress;
-        SetHighColor(ui_color(B_CONTROL_HIGHLIGHT_COLOR));
-        FillRect(barRect);
+        // Progress bar
+        rgb_color barColor = {50, 150, 255, 255};
 
-        SetHighColor(ui_color(B_PANEL_TEXT_COLOR));
+        float progress = fNotification->Progress() * 100;
+        BRect barFrame(2, 2, progRect.right - 2, 2 + progRect.Height() - 4);
+
+        float barPos = 0;
+        if (progress == 0)
+            barPos = barFrame.left - 1;
+        else
+            barPos = roundf(barFrame.left - 1
+                + (progress * (barFrame.Width() + 3) / 100));
+
+        PushState();
+            be_control_look->DrawStatusBar(this, progRect, updateRect,
+                ui_color(B_PANEL_BACKGROUND_COLOR), barColor, barPos);
+        PopState();
 
-        BString label = "";
-        label << (int)(fProgress * 100) << " %";
+        // Progress text
+        BString label;
+        label << progress << " %";
 
         float labelWidth = be_plain_font->StringWidth(label.String());
         float labelX = progRect.left + (progRect.IntegerWidth() / 2) - (labelWidth / 2);
 
+        SetHighColor(ui_color(B_PANEL_TEXT_COLOR));
         SetLowColor(B_TRANSPARENT_COLOR);
         SetDrawingMode(B_OP_ALPHA);
+
         DrawString(label.String(), label.Length(),
             BPoint(labelX, progRect.top + fh.ascent + fh.leading + kSmallPadding));
-
-        PopState();
     }
 
-    SetDrawingMode(B_OP_ALPHA);
-    SetBlendingMode(B_PIXEL_ALPHA, B_ALPHA_OVERLAY);
-
     // Icon size
     float iconSize = (float)fParent->IconSize();
 
@@ -307 +280 @@
         font_height fh;
         appLine->font.GetHeight(&fh);
 
-        float title_bottom = appLine->location.y + fh.descent;
-
         float ix = kEdgePadding;
-        float iy = 0;
-        if (fParent->Layout() == TitleAboveIcon)
-            iy = title_bottom + kEdgePadding + (Bounds().Height() - title_bottom
-                - kEdgePadding * 2 - iconSize) / 2;
-        else
-            iy = (Bounds().Height() - iconSize) / 2.0;
+        float iy = (Bounds().Height() - iconSize) / 2.0;
 
-        if (fType == B_PROGRESS_NOTIFICATION)
+        if (fNotification->Type() == B_PROGRESS_NOTIFICATION)
             // Move icon up by half progress bar height if it's present
             iy -= (progRect.Height() + kEdgePadding) / 2.0;
 
@@ -326 +292 @@
         iconRect.right = ix + iconSize;
         iconRect.bottom = iy + iconSize;
 
+        SetDrawingMode(B_OP_ALPHA);
+        SetBlendingMode(B_PIXEL_ALPHA, B_ALPHA_OVERLAY);
+
         DrawBitmapAsync(fBitmap, fBitmap->Bounds(),
             iconRect, B_FILTER_BITMAP_BILINEAR);
     }
@@ -348 +317 @@
     closeRect.left = closeRect.right - kCloseSize;
     closeRect.bottom = closeRect.top + kCloseSize;
 
-    PushState();
-        SetHighColor(detailCol);
-        StrokeRoundRect(closeRect, kSmallPadding, kSmallPadding);
-        BRect closeCross = closeRect.InsetByCopy(kSmallPadding, kSmallPadding);
-        StrokeLine(closeCross.LeftTop(), closeCross.RightBottom());
-        StrokeLine(closeCross.LeftBottom(), closeCross.RightTop());
-    PopState();
-
-    Sync();
+    SetHighColor(detailCol);
+    StrokeRoundRect(closeRect, kSmallPadding, kSmallPadding);
+    BRect closeCross = closeRect.InsetByCopy(kSmallPadding, kSmallPadding);
+    StrokeLine(closeCross.LeftTop(), closeCross.RightBottom());
+    StrokeLine(closeCross.LeftBottom(), closeCross.RightTop());
 }
 
 
@@ -366 +331 @@
     int32 buttons;
     Window()->CurrentMessage()->FindInt32("buttons", &buttons);
 
-    switch (buttons) {
-        case B_PRIMARY_MOUSE_BUTTON:
-        {
-            BRect closeRect = Bounds().InsetByCopy(2,2);
-            closeRect.left = closeRect.right - kCloseSize;
-            closeRect.bottom = closeRect.top + kCloseSize;  
-
-            if (!closeRect.Contains(point)) {
-                entry_ref launchRef;
-                BString launchString;
-                BMessage argMsg(B_ARGV_RECEIVED);
-                BMessage refMsg(B_REFS_RECEIVED);
-                entry_ref appRef;
-                bool useArgv = false;
-                BList messages;
-                entry_ref ref;
-
-                if (fDetails->FindString("onClickApp", &launchString) == B_OK)
-                    if (be_roster->FindApp(launchString.String(), &appRef) == B_OK)
-                        useArgv = true;
-                if (fDetails->FindRef("onClickFile", &launchRef) == B_OK) {
-                    if (be_roster->FindApp(&launchRef, &appRef) == B_OK)
-                        useArgv = true;
-                }
-
-                if (fDetails->FindRef("onClickRef", &ref) == B_OK) {            
-                    for (int32 i = 0; fDetails->FindRef("onClickRef", i, &ref) == B_OK; i++)
-                        refMsg.AddRef("refs", &ref);
-
-                    messages.AddItem((void*)&refMsg);
-                }
+    if ((buttons & B_PRIMARY_MOUSE_BUTTON) == 0)
+        return;
 
-                if (useArgv) {
-                    type_code type;
-                    int32 argc = 0;
-                    BString arg;
+    BRect closeRect = Bounds().InsetByCopy(2, 2);
+    closeRect.left = closeRect.right - kCloseSize;
+    closeRect.bottom = closeRect.top + kCloseSize;  
+
+    if (!closeRect.Contains(point)) {
+        BMessage argMsg(B_ARGV_RECEIVED);
+        BMessage refMsg(B_REFS_RECEIVED);
+        entry_ref appRef;
+        bool useArgv = false;
+        BList messages;
+        entry_ref ref;
+
+        if (fNotification->OnClickApp() != NULL)
+            if (be_roster->FindApp(fNotification->OnClickApp(), &appRef) == B_OK)
+                useArgv = true;
+        if (fNotification->OnClickFile() != NULL)
+            if (be_roster->FindApp((entry_ref*)fNotification->OnClickFile(), &appRef) == B_OK)
+                useArgv = true;
+
+        for (int32 i = 0; i < fNotification->CountOnClickRefs(); i++)
+            refMsg.AddRef("refs", fNotification->OnClickRefAt(i));
+        messages.AddItem((void*)&refMsg);
+
+        if (useArgv) {
+            BString arg;
+
+            BPath p(&appRef);
+            argMsg.AddString("argv", p.Path());
+
+            int32 argc = fNotification->CountOnClickArgs() + 1;
+            argMsg.AddInt32("argc", argc);
+
+            for (int32 i = 0; i < fNotification->CountOnClickArgs(); i++)
+                argMsg.AddString("argv", fNotification->OnClickArgAt(i));
+            messages.AddItem((void*)&argMsg);
+        }
 
-                    BPath p(&appRef);
-                    argMsg.AddString("argv", p.Path());
+#if 0
+        BMessage tmp;
+        for (int32 i = 0; fDetails->FindMessage("onClickMsg", i, &tmp) == B_OK; i++)
+            messages.AddItem((void*)&tmp);
+#endif
 
-                    fDetails->GetInfo("onClickArgv", &type, &argc);
-                    argMsg.AddInt32("argc", argc + 1);
+        if (fNotification->OnClickApp() != NULL)
+            be_roster->Launch(fNotification->OnClickApp(), &messages);
+        else
+            be_roster->Launch(fNotification->OnClickFile(), &messages);
+    }
 
-                    for (int32 i = 0; fDetails->FindString("onClickArgv", i, &arg) == B_OK; i++)
-                        argMsg.AddString("argv", arg);
+    // Remove the info view after a click
+    BMessage remove_msg(kRemoveView);
+    remove_msg.AddPointer("view", this);
 
-                    messages.AddItem((void*)&argMsg);
-                }
+    BMessenger msgr(Parent());
+    msgr.SendMessage(&remove_msg);
+}
 
-                BMessage tmp;
-                for (int32 i = 0; fDetails->FindMessage("onClickMsg", i, &tmp) == B_OK; i++)
-                    messages.AddItem((void*)&tmp);
 
-                if (fDetails->FindString("onClickApp", &launchString) == B_OK)
-                    be_roster->Launch(launchString.String(), &messages);
-                else
-                    be_roster->Launch(&launchRef, &messages);
-            }
+BSize
+NotificationView::MinSize()
+{
+    return BLayoutUtils::ComposeSize(ExplicitMinSize(), _CalculateSize());
+}
 
-            // Remove the info view after a click
-            BMessage remove_msg(kRemoveView);
-            remove_msg.AddPointer("view", this);
 
-            BMessenger msgr(Parent());
-            msgr.SendMessage(&remove_msg);
-            break;
-        }
-    }
+BSize
+NotificationView::MaxSize()
+{
+    return BLayoutUtils::ComposeSize(ExplicitMaxSize(), _CalculateSize());
 }
 
 
-void
-NotificationView::FrameResized( float w, float /*h*/)
+BSize
+NotificationView::PreferredSize()
 {
-    SetText(Application(), Title(), Text());
+    return BLayoutUtils::ComposeSize(ExplicitPreferredSize(),
+        _CalculateSize());
 }
 
 
 BHandler*
-NotificationView::ResolveSpecifier(BMessage* msg, int32 index, BMessage* spec, int32 form, const char* prop)
+NotificationView::ResolveSpecifier(BMessage* msg, int32 index, BMessage* spec,
+    int32 form, const char* prop)
 {
     BPropertyInfo prop_info(message_prop_list);
     if (prop_info.FindMatch(msg, index, spec, form, prop) >= 0) {
@@ -467 +438 @@
 }
 
 
-const char*
-NotificationView::Application() const
-{
-    return fApp.Length() > 0 ? fApp.String() : NULL;
-}
-
-
-const char*
-NotificationView::Title() const
-{
-    return fTitle.Length() > 0 ? fTitle.String() : NULL;
-}
-
-
-const char*
-NotificationView::Text() const
-{
-    return fText.Length() > 0 ? fText.String() : NULL;
-}
-
-
 void
-NotificationView::SetText(const char* app, const char* title, const char* text,
-    float newMaxWidth)
+NotificationView::SetText(float newMaxWidth)
 {
     if (newMaxWidth < 0)
         newMaxWidth = Bounds().Width() - (kEdgePadding * 2);
@@ -501 +450 @@
         delete (*lIt);
     fLines.clear();
 
-    fApp = app;
-    fTitle = title;
-    fText = text;
-
     float iconRight = kEdgePadding + kEdgePadding;
     if (fBitmap != NULL)
         iconRight += fParent->IconSize();
@@ -517 +462 @@
 
     // Title
     LineInfo* titleLine = new LineInfo;
-    titleLine->text = fTitle;
+    titleLine->text = fNotification->Title();
     titleLine->font = *be_bold_font;
-
-    if (fParent->Layout() == AllTextRightOfIcon)
-        titleLine->location = BPoint(iconRight, y);
-    else
-        titleLine->location = BPoint(kEdgePadding, y);
+    titleLine->location = BPoint(iconRight, y);
 
     fLines.push_front(titleLine);
     y += fontHeight;
 
-    // Rest of text is rendered with be_plain_font.
+    // Rest of text is rendered with be_plain_font
     be_plain_font->GetHeight(&fh);
     fontHeight = ceilf(fh.leading) + ceilf(fh.descent)
         + ceilf(fh.ascent);
 
-    // Split text into chunks between certain characters and compose the lines.
+    // Split text into chunks between certain characters and compose the lines
     const char kSeparatorCharacters[] = " \n-\\/";
-    BString textBuffer = fText;
+    BString textBuffer = fNotification->Content();
     textBuffer.ReplaceAll("\t", "    ");
     const char* chunkStart = textBuffer.String();
     float maxWidth = newMaxWidth - kEdgePadding - iconRight;
@@ -544 +485 @@
     while (chunkStart - textBuffer.String() < length) {
         size_t chunkLength = strcspn(chunkStart, kSeparatorCharacters) + 1;
 
-        // Start a new line if either we didn't start one before,
-        // the current offset
+        // Start a new line if we didn't start one before
         BString tempText;
         if (line != NULL)
             tempText.SetTo(line->text);
@@ -560 +500 @@
             fLines.push_front(line);
             y += fontHeight;
 
-            // Skip the eventual new-line character at the beginning of this
-            // chunk.
+            // Skip the eventual new-line character at the beginning of this chunk
             if (chunkStart[0] == '\n') {
                 chunkStart++;
                 chunkLength--;
             }
-            // Skip more new-line characters and move the line further down.
+
+            // Skip more new-line characters and move the line further down
             while (chunkStart[0] == '\n') {
                 chunkStart++;
                 chunkLength--;
                 line->location.y += fontHeight;
                 y += fontHeight;
             }
-            // Strip space at beginning of a new line.
+
+            // Strip space at beginning of a new line
             while (chunkStart[0] == ' ') {
                 chunkLength--;
                 chunkStart++;
@@ -584 +525 @@
             break;
 
         // Append the chunk to the current line, which was either a new
-        // line or the one from the previous iteration.
+        // line or the one from the previous iteration
         line->text.Append(chunkStart, chunkLength);
 
         chunkStart += chunkLength;
@@ -594 +535 @@
 
     // Make sure icon fits
     if (fBitmap != NULL) {
-        float minHeight = 0;
-        if (fParent->Layout() == TitleAboveIcon) {
-            LineInfo* appLine = fLines.back();
-            font_height fh;
-            appLine->font.GetHeight(&fh);
-            minHeight = appLine->location.y + fh.descent;
-        }
+        float minHeight = fBitmap->Bounds().Height() + 2 * kEdgePadding;
 
-        minHeight += fBitmap->Bounds().Height() + 2 * kEdgePadding;
         if (fHeight < minHeight)
             fHeight = minHeight;
     }
-
-    BMessenger messenger(Parent());
-    messenger.SendMessage(kResizeToFit);
-}
-
-
-bool
-NotificationView::HasMessageID(const char* id)
-{
-    return fMessageID == id;
 }
 
 
 const char*
-NotificationView::MessageID()
-{
-    return fMessageID.String();
-}
-
-
-void
-NotificationView::SetPosition(bool first, bool last)
-{
-    fIsFirst = first;
-    fIsLast = last;
-}
-
-
-BBitmap*
-NotificationView::_ReadNodeIcon(const char* fileName, icon_size size)
+NotificationView::MessageID() const
 {
-    BEntry entry(fileName, true);
-
-    entry_ref ref;
-    entry.GetRef(&ref);
-
-    BNode node(BPath(&ref).Path());
-
-    BBitmap* ret = new BBitmap(BRect(0, 0, (float)size - 1, (float)size - 1), B_RGBA32);
-    if (BIconUtils::GetIcon(&node, kIconAttribute, kSmallIconAttribute,
-        kLargeIconAttribute, size, ret) != B_OK) {
-        delete ret;
-        ret = NULL;
-    }
-
-    return ret;
+    return fNotification->MessageID();
 }
 
 
-void
-NotificationView::_LoadIcon()
+BSize
+NotificationView::_CalculateSize()
 {
-    // First try to get the icon from the caller application
-    app_info info;
-    BMessenger msgr = fDetails->ReturnAddress();
+    BSize size;
 
-    if (msgr.IsValid())
-        be_roster->GetRunningAppInfo(msgr.Team(), &info);
-    else if (fType == B_PROGRESS_NOTIFICATION)
-        be_roster->GetAppInfo("application/x-vnd.Haiku-notification_server",
-            &info);
-
-    BPath path;
-    path.SetTo(&info.ref);
-
-    fBitmap = _ReadNodeIcon(path.Path(), fParent->IconSize());
-    if (fBitmap)
-        return;
-
-    // If that failed get icons from app_server
-    if (find_directory(B_BEOS_SERVERS_DIRECTORY, &path) != B_OK)
-        return;
-
-    path.Append("app_server");
-
-    BFile file(path.Path(), B_READ_ONLY);
-    if (file.InitCheck() != B_OK)
-        return;
-
-    BResources res(&file);
-    if (res.InitCheck() != B_OK)
-        return;
-
-    // Which one should we choose?
-    const char* iconName = "";
-    switch (fType) {
-        case B_INFORMATION_NOTIFICATION:
-            iconName = "info";
-            break;
-        case B_ERROR_NOTIFICATION:
-            iconName = "stop";
-            break;
-        case B_IMPORTANT_NOTIFICATION:
-            iconName = "warn";
-            break;
-        default:
-            return;
-    }
+    // Parent width, minus the edge padding, minus the pensize
+    size.width = fParent->Width() - (kEdgePadding * 2) - (kPenSize * 2);
+    size.height = fHeight;
 
-    // Allocate the bitmap
-    fBitmap = new BBitmap(BRect(0, 0, (float)B_LARGE_ICON - 1,
-        (float)B_LARGE_ICON - 1), B_RGBA32);
-    if (!fBitmap || fBitmap->InitCheck() != B_OK) {
-        fBitmap = NULL;
-        return;
+    if (fNotification->Type() == B_PROGRESS_NOTIFICATION) {
+        font_height fh;
+        be_plain_font->GetHeight(&fh);
+        float fontHeight = fh.ascent + fh.descent + fh.leading;
+        size.height += (kSmallPadding * 2) + (kEdgePadding * 1) + fontHeight;
     }
 
-    // Load raw icon data
-    size_t size = 0;
-    const uint8* data = (const uint8*)res.LoadResource(B_VECTOR_ICON_TYPE,
-        iconName, &size);
-    if ((data == NULL
-        || BIconUtils::GetVectorIcon(data, size, fBitmap) != B_OK))
-        fBitmap = NULL;
+    return size;
 }

src/servers/notification/NotificationView.h

@@ -11 +11 @@
 #include <list>
 
 #include <Bitmap.h>
-#include <Entry.h>
-#include <Message.h>
 #include <MessageRunner.h>
-#include <MimeType.h>
 #include <Notification.h>
-#include <Path.h>
-#include <Roster.h>
-#include <String.h>
-#include <TextView.h>
 #include <View.h>
 
 class NotificationWindow;
@@ -29 +22 @@
 class NotificationView : public BView {
 public:
                                 NotificationView(NotificationWindow* win,
-                                    notification_type type,
-                                    const char* app, const char* title, 
-                                    const char* text, BMessage* details);
+                                    BNotification* notification,
+                                    bigtime_t timeout = -1);
     virtual                     ~NotificationView();
 
     virtual void                AttachedToWindow();
     virtual void                MessageReceived(BMessage* message);
-    virtual void                GetPreferredSize(float* width, float* height);
     virtual void                Draw(BRect updateRect);
     virtual void                MouseDown(BPoint point);
-    virtual void                FrameResized(float width, float height);
+
+    virtual BSize               MinSize();
+    virtual BSize               MaxSize();
+    virtual BSize               PreferredSize();
 
     virtual BHandler*           ResolveSpecifier(BMessage* msg, int32 index,
                                     BMessage* specifier, int32 form,
                                     const char* property);
     virtual status_t            GetSupportedSuites(BMessage* msg);
 
-            const char*         Application() const;
-            const char*         Title() const;
-            const char*         Text() const;
+            void                SetText(float newMaxWidth = -1);
 
-            void                SetText(const char* app, const char* title,
-                                    const char* text, float newMaxWidth = -1);
-            bool                HasMessageID(const char* id);
-            const char*         MessageID();
-            void                SetPosition(bool first, bool last);
+            const char*         MessageID() const;
 
 private:
-            BBitmap*            _ReadNodeIcon(const char* fileName,
-                                    icon_size size);
-            void                _LoadIcon();
+            BSize               _CalculateSize();
 
-private:
             struct LineInfo {
                 BFont   font;
                 BString text;
@@ -70 +55 @@
 
             typedef std::list<LineInfo*> LineInfoList;
 
-
             NotificationWindow* fParent;
+            BNotification*      fNotification;
+            bigtime_t           fTimeout;
 
-            notification_type   fType;
             BMessageRunner*     fRunner;
-            float               fProgress;
-            BString             fMessageID;
 
-            BMessage*           fDetails;
             BBitmap*            fBitmap;
 
             LineInfoList        fLines;
 
-            BString             fApp;
-            BString             fTitle;
-            BString             fText;
-
             float               fHeight;
-
-            bool                fIsFirst;
-            bool                fIsLast;
 };
 
 #endif  // _NOTIFICATION_VIEW_H

src/servers/notification/NotificationWindow.cpp

@@ -15 +15 @@
 
 #include <Alert.h>
 #include <Application.h>
-#include <Debug.h>
 #include <File.h>
+#include <GroupLayout.h>
+#include <GroupLayoutBuilder.h>
 #include <NodeMonitor.h>
+#include <Path.h>
 #include <PropertyInfo.h>
 
 #include "AppGroupView.h"
 #include "AppUsage.h"
-#include "BorderView.h"
 #include "NotificationWindow.h"
 
 property_info main_prop_list[] = {
-    { "message", {B_GET_PROPERTY, 0}, {B_INDEX_SPECIFIER, 0}, "get a message"},
-    { "message", {B_COUNT_PROPERTIES, 0}, {B_DIRECT_SPECIFIER, 0}, "count messages"},
-    { "message", {B_CREATE_PROPERTY, 0}, {B_DIRECT_SPECIFIER, 0}, "create a message"},
-    { "message", {B_SET_PROPERTY, 0}, {B_INDEX_SPECIFIER, 0 }, "modify a message" },
-    0
+    {
+        "message",
+        { B_GET_PROPERTY, 0 },
+        { B_INDEX_SPECIFIER, 0 },
+        "get a message"
+    },
+    {
+        "message",
+        { B_COUNT_PROPERTIES, 0 },
+        { B_DIRECT_SPECIFIER, 0 },
+        "count messages"
+    },
+    {
+        "message",
+        { B_CREATE_PROPERTY, 0 },
+        { B_DIRECT_SPECIFIER, 0 },
+        "create a message"
+    },
+    {
+        "message",
+        { B_SET_PROPERTY, 0 },
+        { B_INDEX_SPECIFIER, 0 },
+        "modify a message"
+    },
+    { 0, { 0 }, { 0 }, 0, 0 }
 };
 
-const float kCloseSize              = 8;
-const float kExpandSize             = 8;
-const float kPenSize                = 1;
-const float kEdgePadding            = 5;
-const float kSmallPadding           = 2;
+const float kCloseSize = 8;
+const float kExpandSize = 8;
+const float kPenSize = 1;
+const float kEdgePadding = 5;
+const float kSmallPadding = 2;
 
 
 NotificationWindow::NotificationWindow()
     :
-    BWindow(BRect(10, 10, 30, 30), "Notification", B_BORDERED_WINDOW,
+    BWindow(BRect(0, 0, -1, -1), "Notification", B_BORDERED_WINDOW,
         B_AVOID_FRONT | B_AVOID_FOCUS | B_NOT_CLOSABLE | B_NOT_ZOOMABLE
-            | B_NOT_MINIMIZABLE | B_NOT_RESIZABLE, B_ALL_WORKSPACES)
+            | B_NOT_MINIMIZABLE | B_NOT_RESIZABLE | B_AUTO_UPDATE_SIZE_LIMITS,
+        B_ALL_WORKSPACES)
 {
-    fBorder = new BorderView(Bounds(), "Notification");
+    BGroupLayout* layout = new BGroupLayout(B_VERTICAL, 10);
+    layout->SetInsets(5, 5, 5, 5);
 
-    AddChild(fBorder);
+    fView = new BView("top", B_WILL_DRAW, layout);
+    fView->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
 
+    SetLayout(new BGroupLayout(B_VERTICAL));
+    AddChild(BGroupLayoutBuilder(B_VERTICAL)
+        .Add(fView)
+    );
+
+    // The first Show() starts the loop so we have to call Show() and Hide(),
+    // after moving the window out of sight - I'm not sure if Run() is more
+    // appropriate
+    MoveTo(-1, -1);
     Show();
     Hide();
 
-    LoadSettings(true);
-    LoadAppFilters(true);
+    _LoadSettings(true);
+    _LoadAppFilters(true);
 }
 
 
 NotificationWindow::~NotificationWindow()
 {
-    appfilter_t::iterator aIt;
-    for (aIt = fAppFilters.begin(); aIt != fAppFilters.end(); aIt++)
-        delete aIt->second;
+    appfilter_t::iterator fIt;
+    for (fIt = fAppFilters.begin(); fIt != fAppFilters.end(); ++fIt)
+        delete fIt->second;
+
+    appview_t::iterator gIt;
+    for (gIt = fAppViews.begin(); gIt != fAppViews.end(); ++gIt) {
+        fView->GetLayout()->RemoveView(gIt->second);
+        delete gIt->second;
+    }
 }
 
 
 bool
 NotificationWindow::QuitRequested()
 {
-    appview_t::iterator aIt;
-    for (aIt = fAppViews.begin(); aIt != fAppViews.end(); aIt++) {
-        aIt->second->RemoveSelf();
-        delete aIt->second;
-    }
-
-    BMessenger(be_app).SendMessage(B_QUIT_REQUESTED);
-    return BWindow::QuitRequested();
+    be_app_messenger.SendMessage(B_QUIT_REQUESTED);
+    return true;
 }
 
 
 void
-NotificationWindow::WorkspaceActivated(int32 /*workspace*/, bool active)
+NotificationWindow::WorkspaceActivated(int32 workspace, bool active)
 {
-    // Ensure window is in the correct position
     if (active)
-        ResizeAll();
+        // Ensure window is in the current position
+        _ResizeAll();
 }
 
 
@@ -95 +128 @@
     switch (message->what) {
         case B_NODE_MONITOR:
         {
-            LoadSettings();
-            LoadAppFilters();
+            _LoadSettings();
+            _LoadAppFilters();
             break;
         }
-        case kResizeToFit:
-            ResizeAll();
-            break;
         case B_COUNT_PROPERTIES:
         {
             BMessage reply(B_REPLY);
@@ -129 +159 @@
         case B_CREATE_PROPERTY:
         case kNotificationMessage:
         {
-            int32 type;
-            const char* content = NULL;
-            const char* title = NULL;
-            const char* app = NULL;
             BMessage reply(B_REPLY);
-            bool messageOkay = true;
+            BNotification* notification = new BNotification(message);
 
-            if (message->FindInt32("type", &type) != B_OK)
-                type = B_INFORMATION_NOTIFICATION;
-            if (message->FindString("content", &content) != B_OK)
-                messageOkay = false;
-            if (message->FindString("title", &title) != B_OK)
-                messageOkay = false;
-            if (message->FindString("app", &app) != B_OK && message->FindString("appTitle", &app) != B_OK)
-                messageOkay = false;
+            if (notification->InitCheck() == B_OK) {
+                // Time out
+                bigtime_t timeout;
+                if (message->FindInt64("timeout", &timeout) != B_OK)
+                    timeout = -1;
 
-            if (messageOkay) {
-                NotificationView* view = new NotificationView(this, (notification_type)type, app,
-                    title, content, new BMessage(*message));
+                // Determine sender's signature
+                BMessenger messenger = message->ReturnAddress();
+                app_info info;
 
-                appfilter_t::iterator fIt = fAppFilters.find(app);
-                bool allow = false;
-                if (fIt == fAppFilters.end()) {
-                    app_info info;
-                    BMessenger messenger = message->ReturnAddress();
-                    if (messenger.IsValid())
-                        be_roster->GetRunningAppInfo(messenger.Team(), &info);
-                    else
-                        be_roster->GetAppInfo("application/x-vnd.Be-SHEL", &info);
+                if (messenger.IsValid())
+                    be_roster->GetRunningAppInfo(messenger.Team(), &info);
+                else
+                    be_roster->GetAppInfo("application/x-vnd.Be-SHEL", &info);
 
-                    AppUsage* appUsage = new AppUsage(info.ref, app, true);
-                    fAppFilters[app] = appUsage;
+                NotificationView* view = new NotificationView(this, notification,
+                    timeout);
 
-                    appUsage->Allowed(title, (notification_type)type);
+                bool allow = false;
+                appfilter_t::iterator it = fAppFilters.find(info.signature);
 
+                if (it == fAppFilters.end()) {
+                    AppUsage* appUsage = new AppUsage(notification->Group(), true);
+                    appUsage->Allowed(notification->Title(), notification->Type());
+                    fAppFilters[info.signature] = appUsage;
                     allow = true;
                 } else
-                    allow = fIt->second->Allowed(title, (notification_type)type);
+                    allow = it->second->Allowed(notification->Title(), notification->Type());
+                _SaveAppFilters();
 
                 if (allow) {
-                    appview_t::iterator aIt = fAppViews.find(app);
-                    AppGroupView *group = NULL;
+                    BString groupName(notification->Group());
+                    AppGroupView* group = NULL;
+                    appview_t::iterator aIt = fAppViews.find(groupName);
+
                     if (aIt == fAppViews.end()) {
-                        group = new AppGroupView(this, app);
-                        fAppViews[app] = group;
-                        fBorder->AddChild(group);
-                    } else {
+                        group = new AppGroupView(this,
+                            groupName == "" ? NULL : groupName.String());
+                        fAppViews[groupName] = group;
+                        fView->GetLayout()->AddView(group);
+                    } else
                         group = aIt->second;
-                    };
-                    group->AddInfo(view);
-                        
-                    ResizeAll();
-                    
+
+                    if (group) {
+                        group->AddInfo(view);
+                        fViews.push_back(view);
+                    }
+
+                    _ResizeAll();
+
                     reply.AddInt32("error", B_OK);
                 } else
-                    reply.AddInt32("Error", B_ERROR);
+                    reply.AddInt32("error", B_ERROR);
             } else {
                 reply.what = B_MESSAGE_NOT_UNDERSTOOD;
                 reply.AddInt32("error", B_ERROR);
@@ -195 +225 @@
         }
         case kRemoveView:
         {
-            void* _ptr;
-            message->FindPointer("view", &_ptr);
-
-            NotificationView* info
-                = reinterpret_cast<NotificationView*>(_ptr);
+            NotificationView* view = NULL;
+            if (message->FindPointer("view", (void**)&view) != B_OK)
+                return;
 
-            fBorder->RemoveChild(info);
+            views_t::iterator it = find(fViews.begin(), fViews.end(), view);
 
-            std::vector<NotificationView*>::iterator i
-                = find(fViews.begin(), fViews.end(), info);
-            if (i != fViews.end())
-                fViews.erase(i);
+            if (it != fViews.end())
+                fViews.erase(it);
 
-            delete info;
-
-            ResizeAll();
+            _ResizeAll();
             break;
         }
         default:
@@ -266 +290 @@
 
 
 icon_size
-NotificationWindow::IconSize()
+NotificationWindow::IconSize() const
 {
     return fIconSize;
 }
 
 
 int32
-NotificationWindow::Timeout()
+NotificationWindow::Timeout() const
 {
     return fTimeout;
 }
 
 
 
-infoview_layout
-NotificationWindow::Layout()
-{
-    return fLayout;
-}
-
-
 float
-NotificationWindow::ViewWidth()
+NotificationWindow::Width() const
 {
     return fWidth;
 }
 
 
 void
-NotificationWindow::ResizeAll()
+NotificationWindow::_ResizeAll()
 {
+    // Hide if no group views are available
     if (fAppViews.empty()) {
         if (!IsHidden())
             Hide();
@@ -307 +325 @@
     bool shouldHide = true;
 
     for (aIt = fAppViews.begin(); aIt != fAppViews.end(); aIt++) {
-        AppGroupView *app = aIt->second;
-        if (app->HasChildren()) {
+        AppGroupView* groupView = aIt->second;
+
+        // We should not hide the notification window if at least
+        // one group view has children
+        if (groupView->HasChildren())
             shouldHide = false;
-            break;
-        }
+        else if (!groupView->IsHidden())
+            groupView->Hide();
     }
 
-    if (shouldHide) {
-        if (!IsHidden())
-            Hide();
+    if (shouldHide && !IsHidden()) {
+        Hide();
         return;
     }
 
-    if (IsHidden())
-        Show();
-
-    float width = 0;
-    float height = 0;
-
-    for (aIt = fAppViews.begin(); aIt != fAppViews.end(); aIt++) {
-        AppGroupView* view = aIt->second;
-        float w = -1;
-        float h = -1;
-
-        if (!view->HasChildren()) {
-            if (!view->IsHidden())
-                view->Hide();
-        } else {
-            view->GetPreferredSize(&w, &h);
-            width = max_c(width, h);
-
-            view->ResizeToPreferred();
-            view->MoveTo(0, height);
-
-            height += h;
-
-            if (view->IsHidden())
-                view->Show();
-        }
-    }
-
-    ResizeTo(ViewWidth(), height);
-    PopupAnimation(Bounds().Width(), Bounds().Height());
+    _PopupAnimation();
 }
 
 
 void
-NotificationWindow::PopupAnimation(float width, float height)
+NotificationWindow::_PopupAnimation()
 {
+    float width = Width();
+    float height = fView->Bounds().Height();
+
     float x = 0, y = 0, sx, sy;
     float pad = 0;
     BDeskbar deskbar;
@@ -365 +359 @@
         case B_DESKBAR_TOP:
             // Put it just under, top right corner
             sx = frame.right;
-            sy = frame.bottom+pad;
+            sy = frame.bottom + pad;
             y = sy;
-            x = sx-width-pad;
+            x = sx - width - pad;
             break;
         case B_DESKBAR_BOTTOM:
             // Put it just above, lower left corner
             sx = frame.right;
-            sy = frame.top-height-pad;
+            sy = frame.top - height - pad;
             y = sy;
-            x = sx - width-pad;
+            x = sx - width - pad;
             break;
         case B_DESKBAR_LEFT_TOP:
             // Put it just to the right of the deskbar
-            sx = frame.right+pad;
-            sy = frame.top-height;
+            sx = frame.right + pad;
+            sy = frame.top - height;
             x = sx;
-            y = frame.top+pad;
+            y = frame.top + pad;
             break;
         case B_DESKBAR_RIGHT_TOP:
             // Put it just to the left of the deskbar
-            sx = frame.left-width-pad;
-            sy = frame.top-height;
+            sx = frame.left - width - pad;
+            sy = frame.top - height;
             x = sx;
-            y = frame.top+pad;
+            y = frame.top + pad;
             break;
         case B_DESKBAR_LEFT_BOTTOM:
             // Put it to the right of the deskbar.
-            sx = frame.right+pad;
+            sx = frame.right + pad;
             sy = frame.bottom;
             x = sx;
-            y = sy-height-pad;
+            y = sy - height - pad;
             break;
         case B_DESKBAR_RIGHT_BOTTOM:
             // Put it to the left of the deskbar.
-            sx = frame.left-width-pad;
+            sx = frame.left - width - pad;
             sy = frame.bottom;
-            y = sy-height-pad;
+            y = sy - height - pad;
             x = sx;
             break;  
         default:
@@ -409 +403 @@
     }
 
     MoveTo(x, y);
-    
-    if (IsHidden() && fViews.size() != 0)
+
+    if (IsHidden())
         Show();
-    //Activate();// it hides floaters from apps :-(
 }
 
 
 void
-NotificationWindow::LoadSettings(bool startMonitor)
+NotificationWindow::_LoadSettings(bool startMonitor)
 {
     _LoadGeneralSettings(startMonitor);
     _LoadDisplaySettings(startMonitor);
@@ -425 +418 @@
 
 
 void
-NotificationWindow::LoadAppFilters(bool startMonitor)
+NotificationWindow::_LoadAppFilters(bool startMonitor)
 {
     BPath path;
 
@@ -471 +464 @@
 
 
 void
-NotificationWindow::SaveAppFilters()
+NotificationWindow::_SaveAppFilters()
 {
     BPath path;
 
@@ -516 +509 @@
     views_t::iterator it;
     for (it = fViews.begin(); it != fViews.end(); ++it) {
         NotificationView* view = (*it);
-        view->SetText(view->Application(), view->Title(), view->Text());
         view->Invalidate();
     }
 
@@ -526 +518 @@
         entry.GetNodeRef(&nref);
 
         if (watch_node(&nref, B_WATCH_ALL, BMessenger(this)) != B_OK) {
-            BAlert* alert = new BAlert("", "Couldn't start general settings "
-                " monitor.\nLive filter changes disabled.", "OK");
+            BAlert* alert = new BAlert("", "Notification service: Couldn't start "
+                "general settings monitor.\nLive filter changes disabled.", "OK");
             alert->Go();
         }
     }
@@ -561 +553 @@
     else
         fIconSize = (icon_size)setting;
 
-    if (settings.FindInt32(kLayoutName, &setting) != B_OK)
-        fLayout = kDefaultLayout;
-    else {
-        switch (setting) {
-            case 0:
-                fLayout = TitleAboveIcon;
-                break;
-            case 1:
-                fLayout = AllTextRightOfIcon;
-                break;
-            default:
-                fLayout = kDefaultLayout;
-        }
-    }
-
     // Notify the view about the change
     views_t::iterator it;
     for (it = fViews.begin(); it != fViews.end(); ++it) {
         NotificationView* view = (*it);
-        view->SetText(view->Application(), view->Title(), view->Text());
         view->Invalidate();
     }
 
@@ -590 +566 @@
         entry.GetNodeRef(&nref);
 
         if (watch_node(&nref, B_WATCH_ALL, BMessenger(this)) != B_OK) {
-            BAlert* alert = new BAlert("", "Couldn't start display settings "
-                " monitor.\nLive filter changes disabled.", "OK");
+            BAlert* alert = new BAlert("", "Notification service: Couldn't start "
+                "display settings monitor.\nLive filter changes disabled.", "OK");
             alert->Go();
         }
     }

src/servers/notification/NotificationWindow.h

@@ -26 +26 @@
 
 class AppGroupView;
 class AppUsage;
-class BorderView;
-class SettingsFile;
 
 typedef std::map<BString, AppGroupView*> appview_t;
 typedef std::map<BString, AppUsage*> appfilter_t;
@@ -39 +37 @@
 extern const float kExpandSize;
 extern const float kPenSize;
 
-const uint32 kResizeToFit = 'IWrf';
-
 class NotificationWindow : public BWindow {
 public:
                                     NotificationWindow();
@@ -48 +44 @@
 
     virtual bool                    QuitRequested();
     virtual void                    MessageReceived(BMessage*);
-    virtual void                    WorkspaceActivated(int32, bool);
+    virtual void                    WorkspaceActivated(int32 workspace, bool active);
     virtual BHandler*               ResolveSpecifier(BMessage*, int32, BMessage*,
                                         int32, const char*);
 
-            icon_size               IconSize();
-            int32                   Timeout();
-            infoview_layout         Layout();
-            float                   ViewWidth();
-
-            void                    ResizeAll();
+            icon_size               IconSize() const;
+            int32                   Timeout() const;
+            float                   Width() const;
 
 private:
-    friend class AppGroupView;
+            void                    _ResizeAll();
+
+            void                    _PopupAnimation();
 
-            void                    PopupAnimation(float, float);
-            void                    LoadSettings(bool startMonitor = false);
-            void                    LoadAppFilters(bool startMonitor = false);
-            void                    SaveAppFilters();
+            void                    _LoadSettings(bool startMonitor = false);
+            void                    _LoadAppFilters(bool startMonitor = false);
+            void                    _SaveAppFilters();
             void                    _LoadGeneralSettings(bool startMonitor);
             void                    _LoadDisplaySettings(bool startMonitor);
 
-            views_t                 fViews;
-            BorderView*             fBorder;
+            BView*                  fView;
 
+            views_t                 fViews;
             appview_t               fAppViews;
 
             BString                 fStatusText;
@@ -80 +74 @@
             float                   fWidth;
             icon_size               fIconSize;
             int32                   fTimeout;
-            infoview_layout         fLayout;
 
             appfilter_t             fAppFilters;
 };