From 0995b563847c884054e912abbd2c5bc08d614f59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Sun, 18 Mar 2007 13:44:26 +0000 Subject: [PATCH] * 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 | 2 +- src/apps/Jamfile | 2 +- src/apps/{bemail => mail}/AutoTextControl.cpp | 0 src/apps/{bemail => mail}/AutoTextControl.h | 0 src/apps/{bemail => mail}/BeMail.rdef | 4 ++-- src/apps/{bemail => mail}/BmapButton.cpp | 0 src/apps/{bemail => mail}/BmapButton.h | 0 src/apps/{bemail => mail}/ButtonBar.cpp | 0 src/apps/{bemail => mail}/ButtonBar.h | 0 src/apps/{bemail => mail}/ComboBox.cpp | 0 src/apps/{bemail => mail}/ComboBox.h | 0 src/apps/{bemail => mail}/Content.cpp | 2 +- src/apps/{bemail => mail}/Content.h | 0 src/apps/{bemail => mail}/Enclosures.cpp | 0 src/apps/{bemail => mail}/Enclosures.h | 0 src/apps/{bemail => mail}/FieldMsg.h | 0 src/apps/{bemail => mail}/FindWindow.cpp | 0 src/apps/{bemail => mail}/FindWindow.h | 0 src/apps/{bemail => mail}/Header.cpp | 0 src/apps/{bemail => mail}/Header.h | 0 src/apps/{bemail => mail}/Jamfile | 10 ++++---- src/apps/{bemail => mail}/KUndoBuffer.cpp | 0 src/apps/{bemail => mail}/KUndoBuffer.h | 0 src/apps/{bemail => mail}/LICENSE | 0 src/apps/{bemail => mail}/Mail.cpp | 23 +++++++++---------- src/apps/{bemail => mail}/Mail.h | 0 src/apps/{bemail => mail}/Prefs.cpp | 2 +- src/apps/{bemail => mail}/Prefs.h | 0 src/apps/{bemail => mail}/QueryMenu.cpp | 0 src/apps/{bemail => mail}/QueryMenu.h | 0 src/apps/{bemail => mail}/Signature.cpp | 0 src/apps/{bemail => mail}/Signature.h | 0 src/apps/{bemail => mail}/Spell.html | 0 src/apps/{bemail => mail}/Status.cpp | 0 src/apps/{bemail => mail}/Status.h | 0 src/apps/{bemail => mail}/Utilities.cpp | 0 src/apps/{bemail => mail}/Utilities.h | 0 src/apps/{bemail => mail}/WIndex.cpp | 0 src/apps/{bemail => mail}/WIndex.h | 0 src/apps/{bemail => mail}/Words.cpp | 0 src/apps/{bemail => mail}/Words.h | 0 src/apps/{bemail => mail}/geekspeak | 0 src/apps/{bemail => mail}/pictures.rdef | 0 src/apps/{bemail => mail}/words | 0 44 files changed, 22 insertions(+), 23 deletions(-) rename src/apps/{bemail => mail}/AutoTextControl.cpp (100%) rename src/apps/{bemail => mail}/AutoTextControl.h (100%) rename src/apps/{bemail => mail}/BeMail.rdef (99%) rename src/apps/{bemail => mail}/BmapButton.cpp (100%) rename src/apps/{bemail => mail}/BmapButton.h (100%) rename src/apps/{bemail => mail}/ButtonBar.cpp (100%) rename src/apps/{bemail => mail}/ButtonBar.h (100%) rename src/apps/{bemail => mail}/ComboBox.cpp (100%) rename src/apps/{bemail => mail}/ComboBox.h (100%) rename src/apps/{bemail => mail}/Content.cpp (99%) rename src/apps/{bemail => mail}/Content.h (100%) rename src/apps/{bemail => mail}/Enclosures.cpp (100%) rename src/apps/{bemail => mail}/Enclosures.h (100%) rename src/apps/{bemail => mail}/FieldMsg.h (100%) rename src/apps/{bemail => mail}/FindWindow.cpp (100%) rename src/apps/{bemail => mail}/FindWindow.h (100%) rename src/apps/{bemail => mail}/Header.cpp (100%) rename src/apps/{bemail => mail}/Header.h (100%) rename src/apps/{bemail => mail}/Jamfile (70%) rename src/apps/{bemail => mail}/KUndoBuffer.cpp (100%) rename src/apps/{bemail => mail}/KUndoBuffer.h (100%) rename src/apps/{bemail => mail}/LICENSE (100%) rename src/apps/{bemail => mail}/Mail.cpp (99%) rename src/apps/{bemail => mail}/Mail.h (100%) rename src/apps/{bemail => mail}/Prefs.cpp (99%) rename src/apps/{bemail => mail}/Prefs.h (100%) rename src/apps/{bemail => mail}/QueryMenu.cpp (100%) rename src/apps/{bemail => mail}/QueryMenu.h (100%) rename src/apps/{bemail => mail}/Signature.cpp (100%) rename src/apps/{bemail => mail}/Signature.h (100%) rename src/apps/{bemail => mail}/Spell.html (100%) rename src/apps/{bemail => mail}/Status.cpp (100%) rename src/apps/{bemail => mail}/Status.h (100%) rename src/apps/{bemail => mail}/Utilities.cpp (100%) rename src/apps/{bemail => mail}/Utilities.h (100%) rename src/apps/{bemail => mail}/WIndex.cpp (100%) rename src/apps/{bemail => mail}/WIndex.h (100%) rename src/apps/{bemail => mail}/Words.cpp (100%) rename src/apps/{bemail => mail}/Words.h (100%) rename src/apps/{bemail => mail}/geekspeak (100%) rename src/apps/{bemail => mail}/pictures.rdef (100%) rename src/apps/{bemail => mail}/words (100%) diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage index a09e0fb8a3..c677c7ad9d 100644 --- a/build/jam/HaikuImage +++ b/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 diff --git a/src/apps/Jamfile b/src/apps/Jamfile index b74bdd8bb2..ebd6fb4d25 100644 --- a/src/apps/Jamfile +++ b/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 ; diff --git a/src/apps/bemail/AutoTextControl.cpp b/src/apps/mail/AutoTextControl.cpp similarity index 100% rename from src/apps/bemail/AutoTextControl.cpp rename to src/apps/mail/AutoTextControl.cpp diff --git a/src/apps/bemail/AutoTextControl.h b/src/apps/mail/AutoTextControl.h similarity index 100% rename from src/apps/bemail/AutoTextControl.h rename to src/apps/mail/AutoTextControl.h diff --git a/src/apps/bemail/BeMail.rdef b/src/apps/mail/BeMail.rdef similarity index 99% rename from src/apps/bemail/BeMail.rdef rename to src/apps/mail/BeMail.rdef index 5c3a1f30ad..d8e851b46b 100644 --- a/src/apps/bemail/BeMail.rdef +++ b/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 { diff --git a/src/apps/bemail/BmapButton.cpp b/src/apps/mail/BmapButton.cpp similarity index 100% rename from src/apps/bemail/BmapButton.cpp rename to src/apps/mail/BmapButton.cpp diff --git a/src/apps/bemail/BmapButton.h b/src/apps/mail/BmapButton.h similarity index 100% rename from src/apps/bemail/BmapButton.h rename to src/apps/mail/BmapButton.h diff --git a/src/apps/bemail/ButtonBar.cpp b/src/apps/mail/ButtonBar.cpp similarity index 100% rename from src/apps/bemail/ButtonBar.cpp rename to src/apps/mail/ButtonBar.cpp diff --git a/src/apps/bemail/ButtonBar.h b/src/apps/mail/ButtonBar.h similarity index 100% rename from src/apps/bemail/ButtonBar.h rename to src/apps/mail/ButtonBar.h diff --git a/src/apps/bemail/ComboBox.cpp b/src/apps/mail/ComboBox.cpp similarity index 100% rename from src/apps/bemail/ComboBox.cpp rename to src/apps/mail/ComboBox.cpp diff --git a/src/apps/bemail/ComboBox.h b/src/apps/mail/ComboBox.h similarity index 100% rename from src/apps/bemail/ComboBox.h rename to src/apps/mail/ComboBox.h diff --git a/src/apps/bemail/Content.cpp b/src/apps/mail/Content.cpp similarity index 99% rename from src/apps/bemail/Content.cpp rename to src/apps/mail/Content.cpp index 9c50cda89c..045f75c8a1 100644 --- a/src/apps/bemail/Content.cpp +++ b/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; diff --git a/src/apps/bemail/Content.h b/src/apps/mail/Content.h similarity index 100% rename from src/apps/bemail/Content.h rename to src/apps/mail/Content.h diff --git a/src/apps/bemail/Enclosures.cpp b/src/apps/mail/Enclosures.cpp similarity index 100% rename from src/apps/bemail/Enclosures.cpp rename to src/apps/mail/Enclosures.cpp diff --git a/src/apps/bemail/Enclosures.h b/src/apps/mail/Enclosures.h similarity index 100% rename from src/apps/bemail/Enclosures.h rename to src/apps/mail/Enclosures.h diff --git a/src/apps/bemail/FieldMsg.h b/src/apps/mail/FieldMsg.h similarity index 100% rename from src/apps/bemail/FieldMsg.h rename to src/apps/mail/FieldMsg.h diff --git a/src/apps/bemail/FindWindow.cpp b/src/apps/mail/FindWindow.cpp similarity index 100% rename from src/apps/bemail/FindWindow.cpp rename to src/apps/mail/FindWindow.cpp diff --git a/src/apps/bemail/FindWindow.h b/src/apps/mail/FindWindow.h similarity index 100% rename from src/apps/bemail/FindWindow.h rename to src/apps/mail/FindWindow.h diff --git a/src/apps/bemail/Header.cpp b/src/apps/mail/Header.cpp similarity index 100% rename from src/apps/bemail/Header.cpp rename to src/apps/mail/Header.cpp diff --git a/src/apps/bemail/Header.h b/src/apps/mail/Header.h similarity index 100% rename from src/apps/bemail/Header.h rename to src/apps/mail/Header.h diff --git a/src/apps/bemail/Jamfile b/src/apps/mail/Jamfile similarity index 70% rename from src/apps/bemail/Jamfile rename to src/apps/mail/Jamfile index 7b5a8a1ab5..7f4e1a7feb 100644 --- a/src/apps/bemail/Jamfile +++ b/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 ; diff --git a/src/apps/bemail/KUndoBuffer.cpp b/src/apps/mail/KUndoBuffer.cpp similarity index 100% rename from src/apps/bemail/KUndoBuffer.cpp rename to src/apps/mail/KUndoBuffer.cpp diff --git a/src/apps/bemail/KUndoBuffer.h b/src/apps/mail/KUndoBuffer.h similarity index 100% rename from src/apps/bemail/KUndoBuffer.h rename to src/apps/mail/KUndoBuffer.h diff --git a/src/apps/bemail/LICENSE b/src/apps/mail/LICENSE similarity index 100% rename from src/apps/bemail/LICENSE rename to src/apps/mail/LICENSE diff --git a/src/apps/bemail/Mail.cpp b/src/apps/mail/Mail.cpp similarity index 99% rename from src/apps/bemail/Mail.cpp rename to src/apps/mail/Mail.cpp index e6cd71c4f8..e358d9202f 100644 --- a/src/apps/bemail/Mail.cpp +++ b/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 diff --git a/src/apps/bemail/Mail.h b/src/apps/mail/Mail.h similarity index 100% rename from src/apps/bemail/Mail.h rename to src/apps/mail/Mail.h diff --git a/src/apps/bemail/Prefs.cpp b/src/apps/mail/Prefs.cpp similarity index 99% rename from src/apps/bemail/Prefs.cpp rename to src/apps/mail/Prefs.cpp index 3cfce6869e..3a242f3d22 100644 --- a/src/apps/bemail/Prefs.cpp +++ b/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; diff --git a/src/apps/bemail/Prefs.h b/src/apps/mail/Prefs.h similarity index 100% rename from src/apps/bemail/Prefs.h rename to src/apps/mail/Prefs.h diff --git a/src/apps/bemail/QueryMenu.cpp b/src/apps/mail/QueryMenu.cpp similarity index 100% rename from src/apps/bemail/QueryMenu.cpp rename to src/apps/mail/QueryMenu.cpp diff --git a/src/apps/bemail/QueryMenu.h b/src/apps/mail/QueryMenu.h similarity index 100% rename from src/apps/bemail/QueryMenu.h rename to src/apps/mail/QueryMenu.h diff --git a/src/apps/bemail/Signature.cpp b/src/apps/mail/Signature.cpp similarity index 100% rename from src/apps/bemail/Signature.cpp rename to src/apps/mail/Signature.cpp diff --git a/src/apps/bemail/Signature.h b/src/apps/mail/Signature.h similarity index 100% rename from src/apps/bemail/Signature.h rename to src/apps/mail/Signature.h diff --git a/src/apps/bemail/Spell.html b/src/apps/mail/Spell.html similarity index 100% rename from src/apps/bemail/Spell.html rename to src/apps/mail/Spell.html diff --git a/src/apps/bemail/Status.cpp b/src/apps/mail/Status.cpp similarity index 100% rename from src/apps/bemail/Status.cpp rename to src/apps/mail/Status.cpp diff --git a/src/apps/bemail/Status.h b/src/apps/mail/Status.h similarity index 100% rename from src/apps/bemail/Status.h rename to src/apps/mail/Status.h diff --git a/src/apps/bemail/Utilities.cpp b/src/apps/mail/Utilities.cpp similarity index 100% rename from src/apps/bemail/Utilities.cpp rename to src/apps/mail/Utilities.cpp diff --git a/src/apps/bemail/Utilities.h b/src/apps/mail/Utilities.h similarity index 100% rename from src/apps/bemail/Utilities.h rename to src/apps/mail/Utilities.h diff --git a/src/apps/bemail/WIndex.cpp b/src/apps/mail/WIndex.cpp similarity index 100% rename from src/apps/bemail/WIndex.cpp rename to src/apps/mail/WIndex.cpp diff --git a/src/apps/bemail/WIndex.h b/src/apps/mail/WIndex.h similarity index 100% rename from src/apps/bemail/WIndex.h rename to src/apps/mail/WIndex.h diff --git a/src/apps/bemail/Words.cpp b/src/apps/mail/Words.cpp similarity index 100% rename from src/apps/bemail/Words.cpp rename to src/apps/mail/Words.cpp diff --git a/src/apps/bemail/Words.h b/src/apps/mail/Words.h similarity index 100% rename from src/apps/bemail/Words.h rename to src/apps/mail/Words.h diff --git a/src/apps/bemail/geekspeak b/src/apps/mail/geekspeak similarity index 100% rename from src/apps/bemail/geekspeak rename to src/apps/mail/geekspeak diff --git a/src/apps/bemail/pictures.rdef b/src/apps/mail/pictures.rdef similarity index 100% rename from src/apps/bemail/pictures.rdef rename to src/apps/mail/pictures.rdef diff --git a/src/apps/bemail/words b/src/apps/mail/words similarity index 100% rename from src/apps/bemail/words rename to src/apps/mail/words