* Renamed BeMail to Mail.

* The settings are still saved in "config/settings/BeMail Settings", though.


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

build/jam/HaikuImage

@@ -38,7 +38,7 @@ BEOS_BIN = "[" addattr alert arp basename beep cat catattr chgrp chmod chop chow
 BEOS_APPS = Terminal Expander People ShowImage Pulse ProcessController
 	SoundRecorder Magnify DiskProbe AboutHaiku StyledEdit Installer Workspaces
 	$(X86_ONLY)Cortex $(X86_ONLY)CortexAddOnHost MediaPlayer DeskCalc MidiPlayer
-	Icon-O-Matic BeMail CDPlayer
+	Icon-O-Matic Mail CDPlayer
 ;
 BEOS_PREFERENCES = Appearance Backgrounds DataTranslations E-mail FileTypes Fonts Media Menu
 	Mouse Keyboard Keymap Printers Screen ScreenSaver Sounds Time VirtualMemory

src/apps/Jamfile

@@ -1,7 +1,6 @@
 SubDir HAIKU_TOP src apps ;
 
 SubInclude HAIKU_TOP src apps abouthaiku ;
-SubInclude HAIKU_TOP src apps bemail ;
 SubInclude HAIKU_TOP src apps cdplayer ;
 SubInclude HAIKU_TOP src apps clock ;
 SubInclude HAIKU_TOP src apps codycam ;
@@ -15,6 +14,7 @@ SubInclude HAIKU_TOP src apps glteapot ;
 SubInclude HAIKU_TOP src apps icon-o-matic ;
 SubInclude HAIKU_TOP src apps installer ;
 SubInclude HAIKU_TOP src apps magnify ;
+SubInclude HAIKU_TOP src apps mail ;
 SubInclude HAIKU_TOP src apps mediaplayer ;
 SubInclude HAIKU_TOP src apps midiplayer ;
 SubInclude HAIKU_TOP src apps people ;

src/apps/mail/BeMail.rdef

@@ -18,8 +18,8 @@ resource app_version {
 	variety = B_APPV_FINAL,
 	internal = 3,
 
-	short_info = "BeMail",
-	long_info = "BeMail ©2005-2007 Haiku, Inc."
+	short_info = "Mail",
+	long_info = "Mail ©2005-2007 Haiku, Inc."
 };
 
 resource large_icon {

src/apps/mail/Content.cpp

@@ -1833,7 +1833,7 @@ TTextView::Open(hyper_text *enclosure)
 
 		case TYPE_MAILTO:
 			if (be_roster->Launch(B_MAIL_TYPE, 1, &enclosure->name) < B_OK) {
-				char *argv[] = {"BeMail", enclosure->name};
+				char *argv[] = {"Mail", enclosure->name};
 				be_app->ArgvReceived(2, argv);
 			}
 			break;

src/apps/mail/Jamfile

@@ -1,4 +1,4 @@
-SubDir HAIKU_TOP src apps bemail ;
+SubDir HAIKU_TOP src apps mail ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
@@ -10,8 +10,8 @@ UsePrivateHeaders mail ;
 UsePrivateHeaders textencoding ;
 UsePrivateHeaders shared ;
 
-AddResources BeMail : BeMail.rdef pictures.rdef  ;
-Application BeMail : 
+AddResources Mail : BeMail.rdef pictures.rdef  ;
+Application Mail : 
 	AutoTextControl.cpp
 	BmapButton.cpp
 	ButtonBar.cpp
@@ -30,8 +30,8 @@ Application BeMail :
 	Words.cpp
 	KUndoBuffer.cpp ;
 
-LinkAgainst BeMail : be tracker $(TARGET_LIBSTDC++) libmail.so libtextencoding.so ;
+LinkAgainst Mail : be tracker $(TARGET_LIBSTDC++) libmail.so libtextencoding.so ;
 
 Package haiku-maildaemon-cvs :
-	BeMail : 
+	Mail : 
 	boot beos apps ;

src/apps/mail/Mail.cpp

@@ -292,7 +292,7 @@ void
 TMailApp::AboutRequested()
 {
 	(new BAlert("",
-		"BeMail\nBy Robert Polic\n\n"
+		"Mail\nBy Robert Polic\n\n"
 		"Enhanced by Axel Dörfler and the Dr. Zoidberg crew\n\n"
 		"Compiled on " __DATE__ " at " __TIME__ ".",
 		"OK"))->Go();
@@ -312,7 +312,7 @@ TMailApp::ArgvReceived(int32 argc, char **argv)
 	// a "mailto:" with no name should open an empty window
 	// so remember if we got a "mailto:" even if there isn't a name
 	// that goes along with it (this allows deskbar replicant to open
-	// an empty message even when BeMail is already running)
+	// an empty message even when Mail is already running)
 	bool gotmailto = false;
 
 	for (int32 loop = 1; loop < argc; loop++)
@@ -486,7 +486,7 @@ TMailApp::MessageReceived(BMessage *msg)
 		{
 			// Do we need to update the state of the button bars?
 			if (fPreviousShowButtonBar != sShowButtonBar) {
-				// Notify all BeMail windows
+				// Notify all Mail windows
 				TMailWindow	*window;
 				for (int32 i = 0; (window=(TMailWindow *)fWindowList.ItemAt(i)) != NULL; i++) {
 					window->Lock();
@@ -1204,7 +1204,7 @@ TMailApp::NewWindow(const entry_ref *ref, const char *to, bool resend,
 		}
 	}
 	if (title == "")
-		title = "BeMail";
+		title = "Mail";
 
 	TMailWindow *window = new TMailWindow(r, title.String(), ref, to, &fFont, resend,
 								trackerMessenger);
@@ -1378,7 +1378,7 @@ TMailWindow::TMailWindow(BRect rect, const char *title, const entry_ref *ref,
 	
 	menu->AddSeparatorItem();
 	menu->AddItem(item = new BMenuItem(
-		MDR_DIALECT_CHOICE ("About BeMail", "A) BeMailについて") B_UTF8_ELLIPSIS,
+		MDR_DIALECT_CHOICE ("About", "A) Mailについて") B_UTF8_ELLIPSIS,
 		new BMessage(B_ABOUT_REQUESTED)));
 	item->SetTarget(be_app);
 	
@@ -1428,7 +1428,7 @@ TMailWindow::TMailWindow(BRect rect, const char *title, const entry_ref *ref,
 	}
 	menu->AddSeparatorItem();
 	menu->AddItem(item = new BMenuItem(
-		MDR_DIALECT_CHOICE ("Preferences","P) BeMailの設定") B_UTF8_ELLIPSIS,
+		MDR_DIALECT_CHOICE ("Preferences","P) Mailの設定") B_UTF8_ELLIPSIS,
 		new BMessage(M_PREFS),','));
 	item->SetTarget(be_app);
 	menu_bar->AddItem(menu);
@@ -2015,9 +2015,9 @@ TMailWindow::MessageReceived(BMessage *msg)
 
 			// Update title bar if "subject" has changed
 			if (!fIncoming && fieldMask & FIELD_SUBJECT) {
-				// If no subject, set to "BeMail"
+				// If no subject, set to "Mail"
 				if (!fHeaderView->fSubject->TextView()->TextLength())
-					SetTitle("BeMail");
+					SetTitle("Mail");
 				else
 					SetTitle(fHeaderView->fSubject->Text());
 			}
@@ -3354,7 +3354,7 @@ TMailWindow::Send(bool now)
 
 			char versionString[255];
 			sprintf(versionString,
-				"BeMail - Mail Daemon Replacement %ld.%ld.%ld %s",
+				"Mail - Mail Daemon Replacement %ld.%ld.%ld %s",
 				versionInfo.major, versionInfo.middle, versionInfo.minor, varietyString);
 			fMail->SetHeaderField("X-Mailer", versionString);
 		}
@@ -3672,10 +3672,9 @@ TMailWindow::SetTitleForMessage()
 	//
 	//	Figure out the title of this message and set the title bar
 	//
-	BString title = "BeMail";
+	BString title = "Mail";
 
-	if (fIncoming)
-	{
+	if (fIncoming) {
 		if (fMail->GetName(&title) == B_OK)
 			title << ": \"" << fMail->Subject() << "\"";
 		else

src/apps/mail/Prefs.cpp

@@ -114,7 +114,7 @@ TPrefsWindow::TPrefsWindow(BRect rect, BFont *font, int32 *level, bool *wrap,
 	bool *attachAttributes, bool *cquotes, uint32 *account, int32 *replyTo,
 	char **preamble, char **sig, uint32 *encoding, bool *warnUnencodable,
 	bool *spellCheckStartOn, uint8 *buttonBar)
-	:	BWindow(rect, MDR_DIALECT_CHOICE ("BeMail Preferences","BeMailの設定"), B_TITLED_WINDOW, B_NOT_RESIZABLE | B_NOT_ZOOMABLE)
+	:	BWindow(rect, MDR_DIALECT_CHOICE ("Mail Preferences","Mailの設定"), B_TITLED_WINDOW, B_NOT_RESIZABLE | B_NOT_ZOOMABLE)
 {
 	BMenuField *menu;