Mail daemon now uses standard notification windows.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@43053 a95241bf-73f2-0310-859d-f6bbb57e9c96

src/servers/mail/Jamfile

@@ -19,7 +19,6 @@ Server mail_daemon :
 	MailDaemon.cpp
 	main.cpp
 	Notifier.cpp
-	StatusWindow.cpp
 	: be libmail.so tracker $(HAIKU_LOCALE_LIBS) $(TARGET_LIBSTDC++)
 		$(TARGET_NETWORK_LIBS)
 ;
@@ -37,5 +36,4 @@ DoCatalogs mail_daemon :
 	DeskbarView.cpp
 	MailDaemon.cpp
 	Notifier.cpp
-	StatusWindow.cpp
 ;

src/servers/mail/MailDaemon.cpp

@@ -20,6 +20,7 @@
 #include <FindDirectory.h>
 #include <fs_index.h>
 #include <NodeMonitor.h>
+#include <Notification.h>
 #include <Path.h>
 #include <Roster.h>
 #include <StringList.h>
@@ -111,8 +112,6 @@ MailDaemonApp::MailDaemonApp()
 {
 	fErrorLogWindow = new ErrorLogWindow(BRect(200, 200, 500, 250),
 		B_TRANSLATE("Mail daemon status log"), B_TITLED_WINDOW);
-	fMailStatusWindow = new MailStatusWindow(BRect(40, 400, 360, 400),
-		B_TRANSLATE("Mail Status"), fSettingsFile.ShowStatusWindow());
 	// install MimeTypes, attributes, indices, and the
 	// system beep add startup
 	MakeMimeTypes();
@@ -129,6 +128,7 @@ MailDaemonApp::~MailDaemonApp()
 		delete fQueries.ItemAt(i);
 
 	delete fLEDAnimation;
+	delete fNotification;
 
 	AccountMap::const_iterator it = fAccounts.begin();
 	for (; it != fAccounts.end(); it++)
@@ -190,7 +190,10 @@ MailDaemonApp::ReadyToRun()
 		string = B_TRANSLATE("No new messages");
 
 	fCentralBeep = false;
-	fMailStatusWindow->SetDefaultMessage(string);
+
+	fNotification = new BNotification(B_INFORMATION_NOTIFICATION);
+	fNotification->SetApplication("Mail daemon");
+	fNotification->SetTitle(string);
 
 	fLEDAnimation = new LEDAnimation;
 	SetPulseRate(1000000);
@@ -200,7 +203,7 @@ MailDaemonApp::ReadyToRun()
 void
 MailDaemonApp::RefsReceived(BMessage* message)
 {
-	fMailStatusWindow->Activate(true);
+	be_roster->Notify(*fNotification, 3);
 
 	entry_ref ref;
 	for (int32 i = 0; message->FindRef("refs", i, &ref) == B_OK; i++) {
@@ -250,7 +253,6 @@ MailDaemonApp::MessageReceived(BMessage* msg)
 		case kMsgSettingsUpdated:
 			fSettingsFile.Reload();
 			_UpdateAutoCheck(fSettingsFile.AutoCheckInterval());
-			fMailStatusWindow->SetShowCriterion(fSettingsFile.ShowStatusWindow());
 			break;
 
 		case kMsgAccountsChanged:
@@ -258,12 +260,12 @@ MailDaemonApp::MessageReceived(BMessage* msg)
 			break;
 
 		case kMsgSetStatusWindowMode:	// when to show the status window
-		{
+		{/*
 			int32 mode;
 			if (msg->FindInt32("ShowStatusWindow", &mode) == B_OK)
 				fMailStatusWindow->SetShowCriterion(mode);
 			break;
-		}
+		*/}
 
 		case kMsgMarkMessageAsRead:
 		{
@@ -284,11 +286,6 @@ MailDaemonApp::MessageReceived(BMessage* msg)
 			RefsReceived(msg);
 			break;
 
-		case 'lkch':	// status window look changed
-		case 'wsch':	// workspace changed
-			fMailStatusWindow->PostMessage(msg);
-			break;
-
 		case 'stwg':	// Status window gone
 		{
 			BMessage reply('mnuc');
@@ -386,7 +383,7 @@ MailDaemonApp::MessageReceived(BMessage* msg)
 			else
 				string << B_TRANSLATE("No new messages.");
 
-			fMailStatusWindow->SetDefaultMessage(string.String());
+			fNotification->SetTitle(string.String());
 			break;
 		}
 
@@ -648,7 +645,7 @@ MailDaemonApp::_InitAccount(BMailAccountSettings& settings)
 	}
 	if (account.inboundProtocol) {
 		DefaultNotifier* notifier = new DefaultNotifier(settings.Name(), true,
-			fErrorLogWindow, fMailStatusWindow);
+			fErrorLogWindow);
 		account.inboundProtocol->SetMailNotifier(notifier);
 
 		account.inboundThread = new InboundProtocolThread(
@@ -665,7 +662,7 @@ MailDaemonApp::_InitAccount(BMailAccountSettings& settings)
 	}
 	if (account.outboundProtocol) {
 		DefaultNotifier* notifier = new DefaultNotifier(settings.Name(), false,
-			fErrorLogWindow, fMailStatusWindow);
+			fErrorLogWindow);
 		account.outboundProtocol->SetMailNotifier(notifier);
 
 		account.outboundThread = new OutboundProtocolThread(

src/servers/mail/MailDaemon.h

@@ -24,6 +24,9 @@
 #include "Notifier.h"
 
 
+class BNotification;
+
+
 struct account_protocols {
 	account_protocols() {
 		inboundImage = -1;
@@ -108,7 +111,7 @@ private:
 			AccountMap			fAccounts;
 
 			ErrorLogWindow*		fErrorLogWindow;
-			MailStatusWindow*	fMailStatusWindow;
+			BNotification*		fNotification;
 };
 
 

src/servers/mail/Notifier.cpp

@@ -5,6 +5,7 @@
  */
 
 #include <Catalog.h>
+#include <Roster.h>
 
 #include "Notifier.h"
 
@@ -14,12 +15,16 @@
 
 
 DefaultNotifier::DefaultNotifier(const char* accountName, bool inbound,
-	ErrorLogWindow* errorWindow, MailStatusWindow* statusWindow)
+	ErrorLogWindow* errorWindow)
 	:
 	fAccountName(accountName),
 	fIsInbound(inbound),
 	fErrorWindow(errorWindow),
-	fStatusWindow(statusWindow)
+	fNotification(B_PROGRESS_NOTIFICATION),
+	fTotalItems(0),
+	fItemsDone(0),
+	fTotalSize(0),
+	fSizeDone(0)
 {
 	BString desc;
 	if (fIsInbound == true)
@@ -28,27 +33,23 @@ DefaultNotifier::DefaultNotifier(const char* accountName, bool inbound,
 		desc << B_TRANSLATE("Sending mail for %name");
     desc.ReplaceFirst("%name", fAccountName);
 
-	fStatusWindow->Lock();
+	BString identifier;
-	fStatusView = fStatusWindow->NewStatusView(desc, fIsInbound != false);
+	identifier << (int)this;
-	fStatusWindow->Unlock();
+		// This should get us an unique value for each notifier running
+	fNotification.SetMessageID(identifier);
+	fNotification.SetApplication("Mail daemon");
 }
 
 
 DefaultNotifier::~DefaultNotifier()
 {
-	fStatusWindow->Lock();
-    if (fStatusView->Window())
-		fStatusWindow->RemoveView(fStatusView);
-	delete fStatusView;
-	fStatusWindow->Unlock();
 }
 
 
 MailNotifier*
 DefaultNotifier::Clone()
 {
-	return new DefaultNotifier(fAccountName, fIsInbound, fErrorWindow,
+	return new DefaultNotifier(fAccountName, fIsInbound, fErrorWindow);
-		fStatusWindow);
 }
 
 
@@ -69,38 +70,55 @@ DefaultNotifier::ShowMessage(const char* message)
 void
 DefaultNotifier::SetTotalItems(int32 items)
 {
-	fStatusView->SetTotalItems(items);
+	fTotalItems = items;
+	BString progress;
+	progress << fItemsDone << "/" << fTotalItems;
+	fNotification.SetContent(progress);
 }
 
 
 void
 DefaultNotifier::SetTotalItemsSize(int32 size)
 {
-	fStatusView->SetMaximum(size);
+	fTotalSize = size;
+	fNotification.SetProgress(fSizeDone / (float)fTotalSize);
 }
 
 
 void
 DefaultNotifier::ReportProgress(int bytes, int messages, const char* message)
 {
-	if (bytes != 0)
+	fSizeDone += bytes;
-		fStatusView->AddProgress(bytes);
+	if (fTotalSize > 0)
+		fNotification.SetProgress(fSizeDone / (float)fTotalSize);
+	else {
+		// Likely we should set it as an INFORMATION_NOTIFICATION in that case,
+		// but this can't be done after object creation...
+		fNotification.SetProgress(0);
+	}
 
-	for (int i = 0; i < messages; i++)
+	fItemsDone += messages;
-		fStatusView->AddItem();
+	BString progress;
+	if (fTotalItems > 0)
+		progress << fItemsDone << "/" << fTotalItems;
+
+	fNotification.SetContent(progress);
 
 	if (message != NULL)
-		fStatusView->SetMessage(message);
+		fNotification.SetTitle(message);
 
-	if (fStatusView->ItemsNow() == fStatusView->CountTotalItems())
+	int timeout = 0; // Default timeout
-		fStatusView->Reset();
+	if (fItemsDone == fTotalItems && fTotalItems != 0)
+		timeout = 1; // We're done, make the window go away faster
+	be_roster->Notify(fNotification, timeout);
 }
 
 
 void
 DefaultNotifier::ResetProgress(const char* message)
 {
-	fStatusView->Reset();
+	fNotification.SetProgress(0);
 	if (message != NULL)
-		fStatusView->SetMessage(message);
+		fNotification.SetContent(message);
+	be_roster->Notify(fNotification, 0);
 }

src/servers/mail/Notifier.h

@@ -7,6 +7,7 @@
 #define NOTIFIER_H
 
 
+#include <Notification.h>
 #include <String.h>
 
 #include "MailProtocol.h"
@@ -18,8 +19,7 @@
 class DefaultNotifier : public MailNotifier {
 public:
 								DefaultNotifier(const char* accountName,
-									bool inbound, ErrorLogWindow* errorWindow,
+									bool inbound, ErrorLogWindow* errorWindow);
-									MailStatusWindow* statusWindow);
 								~DefaultNotifier();
 
 			MailNotifier*		Clone();
@@ -37,8 +37,12 @@ private:
 			BString				fAccountName;
 			bool				fIsInbound;
 			ErrorLogWindow*		fErrorWindow;
-			MailStatusWindow*	fStatusWindow;
+			BNotification		fNotification;
-			MailStatusView*		fStatusView;
+
+			int					fTotalItems;
+			int					fItemsDone;
+			int					fTotalSize;
+			int					fSizeDone;
 };
 
 #endif //NOTIFIER_H

src/servers/mail/StatusWindow.cpp

@@ -1,592 +0,0 @@
-/*
- * Copyright 2001-2003 Dr. Zoidberg Enterprises. All rights reserved.
- * Copyright 2004-2011, Haiku Inc. All rights reserved.
- *
- * Distributed under the terms of the MIT License.
- */
-
-
-//! The status window while fetching/sending mails
-
-
-#include "StatusWindow.h"
-
-#include "MailSettings.h"
-
-#include <Application.h>
-#include <Box.h>
-#include <Button.h>
-#include <Catalog.h>
-#include <Directory.h>
-#include <E-mail.h>
-#include <FindDirectory.h>
-#include <Locker.h>
-#include <NodeMonitor.h>
-#include <Path.h>
-#include <Roster.h>
-#include <Screen.h>
-#include <StatusBar.h>
-#include <String.h>
-#include <StringView.h>
-
-#include <stdio.h>
-#include <assert.h>
-
-
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "StatusWindow"
-
-
-static BLocker sLock;
-
-
-MailStatusWindow::MailStatusWindow(BRect rect, const char *name,
-		uint32 showMode)
-	:
-	BWindow(rect, name, B_MODAL_WINDOW_LOOK, B_NORMAL_WINDOW_FEEL,
-		B_NOT_CLOSABLE | B_NO_WORKSPACE_ACTIVATION | B_NOT_V_RESIZABLE
-			| B_NOT_ZOOMABLE | B_NOT_MINIMIZABLE | B_AVOID_FRONT),
-	fShowMode(showMode),
-	fWindowMoved(0L)
-{
-	BRect frame(Bounds());
-	frame.InsetBy(90.0 + 5.0, 5.0);
-
-	fCheckNowButton = new BButton(frame, "check_mail",
-		B_TRANSLATE("Check mail now"),
-		new BMessage('mbth'), B_FOLLOW_LEFT_RIGHT,
-		B_WILL_DRAW | B_FULL_UPDATE_ON_RESIZE | B_NAVIGABLE);
-	fCheckNowButton->ResizeToPreferred();
-	frame = fCheckNowButton->Frame();
-
-	fCheckNowButton->SetTarget(be_app_messenger);
-
-	frame.OffsetBy(0.0, frame.Height());
-	frame.InsetBy(-90.0, 0.0);
-
-	fMessageView = new BStringView(frame, "message_view", "",
-		B_FOLLOW_LEFT_RIGHT, B_WILL_DRAW | B_FULL_UPDATE_ON_RESIZE);
-	fMessageView->SetAlignment(B_ALIGN_CENTER);
-	fMessageView->SetText(B_TRANSLATE("No new messages."));
-	float framewidth = frame.Width();
-	fMessageView->ResizeToPreferred();
-	fMessageView->ResizeTo(framewidth, fMessageView->Bounds().Height());
-	frame = fMessageView->Frame();
-
-	frame.InsetBy(-5.0, -5.0);
-	frame.top = 0.0;
-
-	fDefaultView = new BView(frame, "default_view", B_FOLLOW_LEFT_RIGHT,
-		B_WILL_DRAW | B_FRAME_EVENTS | B_NAVIGABLE_JUMP);
-	fDefaultView->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
-
-	fDefaultView->AddChild(fCheckNowButton);
-	fDefaultView->AddChild(fMessageView);
-
-	fMinWidth = fDefaultView->Bounds().Width();
-	fMinHeight = fDefaultView->Bounds().Height();
-	ResizeTo(fMinWidth, fMinHeight);
-	SetSizeLimits(fMinWidth, 2.0 * fMinWidth, fMinHeight, fMinHeight);
-
-	BMailSettings general;
-	if (general.InitCheck() == B_OK) {
-		// set on-screen location
-
-		frame = general.StatusWindowFrame();
-		BScreen screen(this);
-		if (screen.Frame().Contains(frame)) {
-			MoveTo(frame.LeftTop());
-			if (frame.Width() >= fMinWidth && frame.Height() >= fMinHeight) {
-				float x_off_set = frame.Width() - fMinWidth;
-				float y_off_set = 0; //---The height is constant
-
-				ResizeBy(x_off_set, y_off_set);
-				fDefaultView->ResizeBy(x_off_set, y_off_set);
-				fCheckNowButton->ResizeBy(x_off_set, y_off_set);
-				fMessageView->ResizeBy(x_off_set, y_off_set);
-			}
-		}
-		// set workspace for window
-
-		uint32 workspace = general.StatusWindowWorkspaces();
-		int32 workspacesCount = count_workspaces();
-		uint32 workspacesMask = (workspacesCount > 31 ? 0 : 1L << workspacesCount) - 1;
-		if ((workspacesMask & workspace) && (workspace != Workspaces()))
-			SetWorkspaces(workspace);
-
-		// set look
-
-		SetBorderStyle(general.StatusWindowLook());
-	}
-	AddChild(fDefaultView);
-
-	fFrame = Frame();
-
-	BPath path;
-	status_t status = BMailAccounts::AccountsPath(path);
-	if (status == B_OK) {
-		BDirectory chainDirectory(path.Path());
-		if (chainDirectory.GetNodeRef(&fChainDirectory) == B_OK) {
-			// Watch this directory for changes
-			watch_node(&fChainDirectory, B_WATCH_DIRECTORY, this);
-			_CheckChains();
-		}
-	}
-
-	if (fShowMode != B_MAIL_SHOW_STATUS_WINDOW_ALWAYS)
-		Hide();
-
-	Show();
-}
-
-
-MailStatusWindow::~MailStatusWindow()
-{
-	// remove all status_views, so we don't accidentally delete them
-	while (MailStatusView *status_view = (MailStatusView *)fStatusViews.RemoveItem(0L))
-		RemoveView(status_view);
-
-	BMailSettings general;
-	if (general.InitCheck() == B_OK) {
-		// save the current status window properties
-		general.SetStatusWindowFrame(Frame());
-		general.SetStatusWindowWorkspaces((int32)Workspaces());
-		general.Save();
-	}
-
-	stop_watching(this);
-}
-
-
-//! Activate the "Check Now" button only if there are inbound accounts
-void
-MailStatusWindow::_CheckChains()
-{
-	bool hasInbound = false;
-	BMailAccounts accounts;
-	for (int32 i = 0; i < accounts.CountAccounts(); i++) {
-		if (accounts.AccountAt(i)->HasInbound()) {
-			hasInbound = true;
-			break;
-		}
-	}
-
-	fCheckNowButton->SetEnabled(hasInbound);
-}
-
-
-void
-MailStatusWindow::FrameMoved(BPoint /*origin*/)
-{
-	if (fLastWorkspace == current_workspace())
-		fFrame = Frame();
-}
-
-
-void
-MailStatusWindow::WorkspaceActivated(int32 workspace, bool active)
-{
-	if (!active)
-		return;
-
-	MoveTo(fFrame.LeftTop());
-	fLastWorkspace = workspace;
-
-	// make the window visible if the screen's frame doesn't contain it
-	BScreen screen;
-	if (screen.Frame().bottom < fFrame.top)
-		MoveTo(fFrame.left - 1, screen.Frame().bottom - fFrame.Height() - 4);
-	if (screen.Frame().right < fFrame.left)
-		MoveTo(fFrame.left - 1, screen.Frame().bottom - fFrame.Height() - 4);
-}
-
-
-void
-MailStatusWindow::MessageReceived(BMessage *msg)
-{
-	switch (msg->what) {
-		case 'lkch':
-		{
-			int32 look;
-			if (msg->FindInt32("StatusWindowLook", &look) == B_OK)
-				SetBorderStyle(look);
-			break;
-		}
-		case 'wsch':
-		{
-			uint32 workspaces;
-			if (msg->FindInt32("StatusWindowWorkSpace", (int32 *)&workspaces) != B_OK)
-				break;
-			if (Workspaces() != B_ALL_WORKSPACES && workspaces != B_ALL_WORKSPACES)
-				break;
-			if (workspaces != Workspaces())
-				SetWorkspaces(workspaces);
-			break;
-		}
-		case 'DATA':
-			msg->what = B_REFS_RECEIVED;
-			be_roster->Launch(B_MAIL_TYPE, msg);
-			break;
-
-		case B_NODE_MONITOR:
-			_CheckChains();
-			break;
-
-		default:
-			BWindow::MessageReceived(msg);
-	}
-}
-
-
-void
-MailStatusWindow::SetDefaultMessage(const BString &message)
-{
-	if (Lock()) {
-		fMessageView->SetText(message.String());
-		Unlock();
-	}
-}
-
-
-MailStatusView *
-MailStatusWindow::NewStatusView(const char *description, bool upstream)
-{
-	if (!Lock())
-		return NULL;
-
-	BRect rect = Bounds();
-	rect.top = fStatusViews.CountItems() * (fMinHeight + 1);
-	rect.bottom = rect.top + fMinHeight;
-	MailStatusView *status = new MailStatusView(rect, description, upstream);
-	status->window = this;
-
-	Unlock();
-	return status;
-}
-
-
-void
-MailStatusWindow::ActuallyAddStatusView(MailStatusView *status)
-{
-	if (!Lock())
-		return;
-
-	sLock.Lock();
-
-	BRect rect = Bounds();
-	rect.top = fStatusViews.CountItems() * (fMinHeight + 1);
-	rect.bottom = rect.top + fMinHeight;
-
-	status->MoveTo(rect.LeftTop());
-	status->ResizeTo(rect.Width(), rect.Height());
-
-	fStatusViews.AddItem((void *)status);
-
-	status->Hide();
-	AddChild(status);
-
-	if (CountVisibleItems() == 1)
-		fDefaultView->Hide();
-
-	status->Show();
-	SetSizeLimits(10.0, 2000.0, 10.0, 2000.0);
-
-	// if the window doesn't fit on screen anymore, move it
-	BScreen screen;
-	if (screen.Frame().bottom < Frame().top + rect.bottom) {
-		MoveBy(0, -fMinHeight - 1);
-		fWindowMoved++;
-	}
-
-	ResizeTo(rect.Width(), rect.bottom);
-
-	if (fShowMode != B_MAIL_SHOW_STATUS_WINDOW_ALWAYS
-		&& fShowMode != B_MAIL_SHOW_STATUS_WINDOW_NEVER
-		&& CountVisibleItems() == 1)
-	{
-		SetFlags(Flags() | B_AVOID_FOCUS);
-		Show();
-		SetFlags(Flags() ^ B_AVOID_FOCUS);
-	}
-	sLock.Unlock();
-	Unlock();
-}
-
-
-void
-MailStatusWindow::RemoveView(MailStatusView *view)
-{
-	if (!view || !Lock())
-		return;
-
-	sLock.Lock();
-		// ToDo: although there already is the outer lock, this seems
-		//	to help... (maybe we should investigate this further...)
-
-	int32 i = fStatusViews.IndexOf(view);
-	if (i < 0) {
-		Unlock();
-		return;
-	}
-
-	fStatusViews.RemoveItem((void *)view);
-	if (RemoveChild(view)) {
-		while ((view = (MailStatusView *)fStatusViews.ItemAt(i++)) != NULL)
-			view->MoveBy(0, -fMinHeight - 1);
-
-		// the view will be deleted in the ChainRunner
-		view = NULL;
-	}
-
-	if (fWindowMoved > 0) {
-		fWindowMoved--;
-		MoveBy(0, fMinHeight + 1);
-	}
-
-	if (CountVisibleItems() == 0) {
-		if (fShowMode != B_MAIL_SHOW_STATUS_WINDOW_NEVER
-			&& fShowMode != B_MAIL_SHOW_STATUS_WINDOW_ALWAYS) {
-			while (!IsHidden())
-				Hide();
-		}
-
-		fDefaultView->Show();
-
-		SetSizeLimits(fMinWidth, 2.0 * fMinWidth, fMinHeight, fMinHeight);
-		ResizeTo(fDefaultView->Frame().Width(), fDefaultView->Frame().Height());
-
-		be_app->PostMessage('stwg');
-			// notify that the status window is gone
-	}
-	else
-		ResizeTo(Bounds().Width(), fStatusViews.CountItems() * fMinHeight);
-
-	sLock.Unlock();
-	Unlock();
-}
-
-
-int32
-MailStatusWindow::CountVisibleItems()
-{
-	if (fShowMode != B_MAIL_SHOW_STATUS_WINDOW_WHEN_SENDING)
-		return fStatusViews.CountItems();
-
-	int32 count = 0;
-	for (int32 i = fStatusViews.CountItems(); i-- > 0;) {
-		MailStatusView *view = (MailStatusView *)fStatusViews.ItemAt(i);
-		if (view->is_upstream)
-			count++;
-	}
-	return count;
-}
-
-
-bool
-MailStatusWindow::HasItems(void)
-{
-	return CountVisibleItems() > 0;
-}
-
-
-void
-MailStatusWindow::SetShowCriterion(uint32 when)
-{
-	if (!Lock())
-		return;
-
-	fShowMode = when;
-	if (fShowMode == B_MAIL_SHOW_STATUS_WINDOW_ALWAYS
-		|| (fShowMode != B_MAIL_SHOW_STATUS_WINDOW_NEVER && HasItems()))
-	{
-		while (IsHidden())
-			Show();
-	} else {
-		while (!IsHidden())
-			Hide();
-	}
-	Unlock();
-}
-
-
-void
-MailStatusWindow::SetBorderStyle(int32 look)
-{
-	switch (look) {
-		case B_MAIL_STATUS_LOOK_TITLED:
-			SetLook(B_TITLED_WINDOW_LOOK);
-			break;
-		case B_MAIL_STATUS_LOOK_FLOATING:
-			SetLook(B_FLOATING_WINDOW_LOOK);
-			break;
-		case B_MAIL_STATUS_LOOK_THIN_BORDER:
-			SetLook(B_BORDERED_WINDOW_LOOK);
-			break;
-		case B_MAIL_STATUS_LOOK_NO_BORDER:
-			SetLook(B_NO_BORDER_WINDOW_LOOK);
-			break;
-
-		case B_MAIL_STATUS_LOOK_NORMAL_BORDER:
-		default:
-			SetLook(B_MODAL_WINDOW_LOOK);
-	}
-}
-
-
-//	#pragma mark -
-//------------------------------------------------
-//
-// MailStatusView
-//
-//------------------------------------------------
-
-
-MailStatusView::MailStatusView(BRect rect, const char *description,bool upstream)
-		  : BBox(rect, description, B_FOLLOW_LEFT_RIGHT,
-		  		 B_WILL_DRAW | B_FRAME_EVENTS | B_NAVIGABLE_JUMP,
-		  		 B_PLAIN_BORDER)
-{
-	status = new BStatusBar(BRect(5, 5, Bounds().right - 5, Bounds().bottom - 5),
-							"status_bar", description, "");
-	status->SetResizingMode(B_FOLLOW_ALL_SIDES);
-	status->SetBarHeight(12);
-
-	if (!upstream) {
-		const rgb_color downstreamColor = {48,176,48,255};	// upstream was: {255,100,50,255}
-		status->SetBarColor(downstreamColor);
-	}
-	AddChild(status);
-
-	items_now = 0;
-	total_items = 0;
-	pre_text[0] = 0;
-	is_upstream = upstream;
-
-	by_bytes = false;
-}
-
-
-MailStatusView::~MailStatusView()
-{
-}
-
-
-void
-MailStatusView::AddProgress(int32 how_much)
-{
-	AddSelfToWindow();
-
-	if (LockLooper()) {
-		if (status->CurrentValue() == 0)
-			strcpy(pre_text,status->TrailingText());
-		char final[80];
-		if (by_bytes) {
-			sprintf(final, B_TRANSLATE("%.1f / %.1f kb (%d / %d messages)"),
-				float(float(status->CurrentValue() + how_much) / 1024),
-				float(float(status->MaxValue()) / 1024),(int)items_now+1,
-				(int)total_items);
-			status->Update(how_much,NULL,final);
-		} else {
-			sprintf(final, B_TRANSLATE("%d / %d messages"),(int)items_now,
-				(int)total_items);
-			status->Update(how_much,NULL,final);
-		}
-		UnlockLooper();
-	}
-}
-
-
-void
-MailStatusView::SetMessage(const char *msg)
-{
-	AddSelfToWindow();
-
-	if (LockLooper()) {
-		status->SetTrailingText(msg);
-		UnlockLooper();
-	}
-}
-
-
-void
-MailStatusView::Reset(bool hide)
-{
-	if (!LockLooper())
-		return;
-
-	char old[255];
-	if ((pre_text[0] == 0) && !hide)
-		strcpy(pre_text, status->TrailingText());
-	if (hide)
-		pre_text[0] = 0;
-
-	strcpy(old,status->Label());
-	status->Reset(old);
-	status->SetTrailingText(pre_text);
-	status->Draw(status->Bounds());
-	pre_text[0] = 0;
-	total_items = 0;
-	items_now = 0;
-
-	UnlockLooper();
-
-	if (hide && Window())
-		window->RemoveView(this);
-}
-
-
-void
-MailStatusView::SetMaximum(int32 max_bytes)
-{
-	AddSelfToWindow();
-
-	if (LockLooper()) {
-		if (max_bytes < 0) {
-			status->SetMaxValue(total_items);
-			by_bytes = false;
-		} else {
-			status->SetMaxValue(max_bytes);
-			by_bytes = true;
-		}
-		UnlockLooper();
-	}
-}
-
-
-void
-MailStatusView::SetTotalItems(int32 items)
-{
-	AddSelfToWindow();
-	total_items = items;
-	if (!by_bytes)
-		SetMaximum(-1);
-}
-
-
-int32
-MailStatusView::CountTotalItems()
-{
-	return total_items;
-}
-
-
-void
-MailStatusView::AddItem(void)
-{
-	AddSelfToWindow();
-	items_now++;
-
-	if (!by_bytes)
-		AddProgress(1);
-}
-
-
-void
-MailStatusView::AddSelfToWindow()
-{
-	if (Window() != NULL)
-		return;
-
-	window->ActuallyAddStatusView(this);
-}
-

src/servers/mail/StatusWindow.h

@@ -1,90 +0,0 @@
-/*
- * Copyright 2001-2003 Dr. Zoidberg Enterprises. All rights reserved.
- * Copyright 2004-2007, Haiku Inc. All rights reserved.
- *
- * Distributed under the terms of the MIT License.
- */
-#ifndef ZOIDBERG_STATUS_WINDOW_H
-#define ZOIDBERG_STATUS_WINDOW_H
-
-
-#include <Alert.h>
-#include <Box.h>
-#include <List.h>
-#include <Node.h>
-#include <Window.h>
-
-class BStatusBar;
-class BStringView;
-class MailStatusView;
-
-class MailStatusWindow : public BWindow {
-	public:
-		MailStatusWindow(BRect rect, const char *name, uint32 showMode);
-		~MailStatusWindow();
-
-		virtual	void FrameMoved(BPoint origin);
-		virtual void WorkspaceActivated(int32 workspace, bool active);
-		virtual void MessageReceived(BMessage *msg);
-
-		MailStatusView *NewStatusView(const char *description, bool upstream);
-		void	RemoveView(MailStatusView *view);
-		int32	CountVisibleItems();
-
-		bool	HasItems(void);
-		void	SetShowCriterion(uint32);
-		void	SetDefaultMessage(const BString &message);
-
-	private:
-		friend class MailStatusView;
-
-		void	_CheckChains();
-		void	SetBorderStyle(int32 look);
-		void	ActuallyAddStatusView(MailStatusView *status);
-
-		node_ref	fChainDirectory;
-		BButton*	fCheckNowButton;
-		BList		fStatusViews;
-		uint32		fShowMode;
-		BView		*fDefaultView;
-		BStringView	*fMessageView;
-		float		fMinWidth;
-		float		fMinHeight;
-		int32		fWindowMoved;
-		int32		fLastWorkspace;
-		BRect		fFrame;
-
-		uint32		_reserved[5];
-};
-
-class MailStatusView : public BBox {
-public:
-								~MailStatusView();
-
-			void				AddProgress(int32 how_much);
-			void				SetMessage(const char *msg);
-			void				SetMaximum(int32 max_bytes);
-			int32				CountTotalItems();
-			void				SetTotalItems(int32 items);
-			void				AddItem(void);
-			void				Reset(bool hide = true);
-			int32				ItemsNow() { return items_now; }
-
-private:
-		friend class	MailStatusWindow;
-		
-						MailStatusView(BRect rect,const char *description,bool upstream);
-				void	AddSelfToWindow();
-		
-		BStatusBar		*status;
-		MailStatusWindow	*window;
-		int32			items_now;
-		int32			total_items;
-		bool			is_upstream;
-		bool			by_bytes;
-		char 			pre_text[255];
-
-		uint32			_reserved[5];
-};
-
-#endif	/* ZOIDBERG_STATUS_WINDOW_H */