i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Hopefully this are all remaining read erros.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30651 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Clemens Zeidler
2009-05-06 17:07:57 +00:00
parent e94e90f071
commit f5b22bcfa8
7 changed files with 57 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/mail/MailApp.cpp
+7 -7
View File
@@ -130,7 +130,7 @@ TMailApp::TMailApp()
{ {
// set default values // set default values
fContentFont.SetSize(12.0); fContentFont.SetSize(12.0);
fAutoMarkReaded = true; fAutoMarkRead = true;
fSignature = (char *)malloc(strlen(SIG_NONE) + 1); fSignature = (char *)malloc(strlen(SIG_NONE) + 1);
strcpy(fSignature, SIG_NONE); strcpy(fSignature, SIG_NONE);
fReplyPreamble = (char *)malloc(1); fReplyPreamble = (char *)malloc(1);
@@ -349,7 +349,7 @@ TMailApp::MessageReceived(BMessage *msg)
&fColoredQuotes, &fDefaultChain, &fUseAccountFrom, &fColoredQuotes, &fDefaultChain, &fUseAccountFrom,
&fReplyPreamble, &fSignature, &fMailCharacterSet, &fReplyPreamble, &fSignature, &fMailCharacterSet,
&fWarnAboutUnencodableCharacters, &fWarnAboutUnencodableCharacters,
&fStartWithSpellCheckOn, &fAutoMarkReaded, &fStartWithSpellCheckOn, &fAutoMarkRead,
&fShowButtonBar); &fShowButtonBar);
fPrefsWindow->Show(); fPrefsWindow->Show();
} }
@@ -912,7 +912,7 @@ TMailApp::SaveSettings()
settings.AddRect("SignatureWindowSize", fSignatureWindowFrame); settings.AddRect("SignatureWindowSize", fSignatureWindowFrame);
settings.AddBool("WordWrapMode", fWrapMode); settings.AddBool("WordWrapMode", fWrapMode);
settings.AddPoint("PreferencesWindowLocation", fPrefsWindowPos); settings.AddPoint("PreferencesWindowLocation", fPrefsWindowPos);
settings.AddBool("AutoMarkReaded", fAutoMarkReaded); settings.AddBool("AutoMarkRead", fAutoMarkRead);
settings.AddString("SignatureText", fSignature); settings.AddString("SignatureText", fSignature);
settings.AddInt32("CharacterSet", fMailCharacterSet); settings.AddInt32("CharacterSet", fMailCharacterSet);
settings.AddString("FindString", FindWindow::GetFindString()); settings.AddString("FindString", FindWindow::GetFindString());
@@ -1001,8 +1001,8 @@ TMailApp::LoadSettings()
if (settings.FindPoint("PreferencesWindowLocation", &point) == B_OK) if (settings.FindPoint("PreferencesWindowLocation", &point) == B_OK)
fPrefsWindowPos = point; fPrefsWindowPos = point;
if (settings.FindBool("AutoMarkReaded", &boolValue) == B_OK) if (settings.FindBool("AutoMarkRead", &boolValue) == B_OK)
fAutoMarkReaded = boolValue; fAutoMarkRead = boolValue;
const char *string; const char *string;
if (settings.FindString("SignatureText", &string) == B_OK) { if (settings.FindString("SignatureText", &string) == B_OK) {
@@ -1142,10 +1142,10 @@ TMailApp::NewWindow(const entry_ref* ref, const char* to, bool resend,
bool bool
TMailApp::AutoMarkReaded() TMailApp::AutoMarkRead()
{ {
BAutolock _(this); BAutolock _(this);
return fAutoMarkReaded; return fAutoMarkRead;
} }
src/apps/mail/MailApp.h
+2 -2
View File
@@ -73,7 +73,7 @@ class TMailApp : public BApplication {
void SetLastWindowFrame(BRect frame); void SetLastWindowFrame(BRect frame);
// TODO: move these into a MailSettings class // TODO: move these into a MailSettings class
bool AutoMarkReaded(); bool AutoMarkRead();
BString Signature(); BString Signature();
BString ReplyPreamble(); BString ReplyPreamble();
bool WrapMode(); bool WrapMode();
@@ -114,7 +114,7 @@ class TMailApp : public BApplication {
bool fPrintHelpAndExit; bool fPrintHelpAndExit;
// TODO: these should go into a settings class // TODO: these should go into a settings class
bool fAutoMarkReaded; bool fAutoMarkRead;
char* fSignature; char* fSignature;
char* fReplyPreamble; char* fReplyPreamble;
bool fWrapMode; bool fWrapMode;
src/apps/mail/MailWindow.cpp
+20 -20
View File
@@ -167,7 +167,7 @@ TMailWindow::TMailWindow(BRect rect, const char* title, TMailApp* app,
fChanged(false), fChanged(false),
fStartingText(NULL), fStartingText(NULL),
fOriginatingWindow(NULL), fOriginatingWindow(NULL),
fReadedButton(NULL), fReadButton(NULL),
fNextButton(NULL) fNextButton(NULL)
{ {
if (messenger != NULL) if (messenger != NULL)
@@ -194,7 +194,7 @@ TMailWindow::TMailWindow(BRect rect, const char* title, TMailApp* app,
fIncoming = false; fIncoming = false;
} }
fAutoMarkReaded = fApp->AutoMarkReaded(); fAutoMarkRead = fApp->AutoMarkRead();
BRect r(0, 0, RIGHT_BOUNDARY, 15); BRect r(0, 0, RIGHT_BOUNDARY, 15);
fMenuBar = new BMenuBar(r, ""); fMenuBar = new BMenuBar(r, "");
@@ -634,8 +634,8 @@ TMailWindow::BuildButtonBar()
new BMessage(M_NEXTMSG)); new BMessage(M_NEXTMSG));
bbar->AddButton(MDR_DIALECT_CHOICE ("Previous","前へ"), 20, bbar->AddButton(MDR_DIALECT_CHOICE ("Previous","前へ"), 20,
new BMessage(M_PREVMSG)); new BMessage(M_PREVMSG));
if (!fAutoMarkReaded) { if (!fAutoMarkRead) {
_AddReadedButton(); _AddReadButton();
} }
} }
bbar->AddButton(MDR_DIALECT_CHOICE ("Inbox","受信箱"), 36, bbar->AddButton(MDR_DIALECT_CHOICE ("Inbox","受信箱"), 36,
@@ -696,7 +696,7 @@ TMailWindow::UpdateViews()
void void
TMailWindow::UpdatePreferences() TMailWindow::UpdatePreferences()
{ {
fAutoMarkReaded = fApp->AutoMarkReaded(); fAutoMarkRead = fApp->AutoMarkRead();
_UpdateReadButton(); _UpdateReadButton();
} }
@@ -817,17 +817,17 @@ TMailWindow::SetTrackerSelectionToCurrent()
void void
TMailWindow::SetCurrentMessageRead(bool readed) TMailWindow::SetCurrentMessageRead(bool read)
{ {
BNode node(fRef); BNode node(fRef);
if (node.InitCheck() == B_NO_ERROR) { if (node.InitCheck() == B_NO_ERROR) {
BString status; BString status;
if (ReadAttrString(&node, B_MAIL_ATTR_STATUS, &status) == B_NO_ERROR) { if (ReadAttrString(&node, B_MAIL_ATTR_STATUS, &status) == B_NO_ERROR) {
if (readed && !status.ICompare("New")) { if (read && !status.ICompare("New")) {
node.RemoveAttr(B_MAIL_ATTR_STATUS); node.RemoveAttr(B_MAIL_ATTR_STATUS);
WriteAttrString(&node, B_MAIL_ATTR_STATUS, "Read"); WriteAttrString(&node, B_MAIL_ATTR_STATUS, "Read");
} }
if (!readed && !status.ICompare("Read")) { if (!read && !status.ICompare("Read")) {
node.RemoveAttr(B_MAIL_ATTR_STATUS); node.RemoveAttr(B_MAIL_ATTR_STATUS);
WriteAttrString(&node, B_MAIL_ATTR_STATUS, "New"); WriteAttrString(&node, B_MAIL_ATTR_STATUS, "New");
} }
@@ -1116,7 +1116,7 @@ TMailWindow::MessageReceived(BMessage *msg)
foundRef = GetTrackerWindowFile(&nextRef, msg->what == foundRef = GetTrackerWindowFile(&nextRef, msg->what ==
M_DELETE_NEXT); M_DELETE_NEXT);
} }
if (fIncoming && fAutoMarkReaded) if (fIncoming && fAutoMarkRead)
SetCurrentMessageRead(); SetCurrentMessageRead();
if (!fTrackerMessenger.IsValid() || !fIncoming) { if (!fTrackerMessenger.IsValid() || !fIncoming) {
@@ -1441,7 +1441,7 @@ TMailWindow::MessageReceived(BMessage *msg)
SetCurrentMessageRead(false); SetCurrentMessageRead(false);
_UpdateReadButton(); _UpdateReadButton();
break; break;
case M_READED: case M_READ:
SetCurrentMessageRead(); SetCurrentMessageRead();
msg->what = M_NEXTMSG; msg->what = M_NEXTMSG;
case M_PREVMSG: case M_PREVMSG:
@@ -1452,7 +1452,7 @@ TMailWindow::MessageReceived(BMessage *msg)
if (GetTrackerWindowFile(&nextRef, (msg->what == M_NEXTMSG))) { if (GetTrackerWindowFile(&nextRef, (msg->what == M_NEXTMSG))) {
TMailWindow *window = static_cast<TMailApp *>(be_app)->FindWindow(nextRef); TMailWindow *window = static_cast<TMailApp *>(be_app)->FindWindow(nextRef);
if (window == NULL) { if (window == NULL) {
if (fAutoMarkReaded) if (fAutoMarkRead)
SetCurrentMessageRead(); SetCurrentMessageRead();
OpenMessage(&nextRef, fHeaderView->fCharacterSetUserSees); OpenMessage(&nextRef, fHeaderView->fCharacterSetUserSees);
} else { } else {
@@ -1707,7 +1707,7 @@ TMailWindow::QuitRequested()
} }
} else if (fRef && !sKeepStatusOnQuit) { } else if (fRef && !sKeepStatusOnQuit) {
// ...Otherwise just set the message read // ...Otherwise just set the message read
if (fAutoMarkReaded) if (fAutoMarkRead)
SetCurrentMessageRead(); SetCurrentMessageRead();
} }
@@ -3133,7 +3133,7 @@ TMailWindow::_BuildQueryString(BEntry* entry) const
void void
TMailWindow::_AddReadedButton() TMailWindow::_AddReadButton()
{ {
bool newMail = false; bool newMail = false;
BNode node(fRef); BNode node(fRef);
@@ -3147,11 +3147,11 @@ TMailWindow::_AddReadedButton()
int32 buttonIndex = fButtonBar->IndexOf(fNextButton); int32 buttonIndex = fButtonBar->IndexOf(fNextButton);
if (newMail) if (newMail)
fReadedButton = fButtonBar->AddButton( fReadButton = fButtonBar->AddButton(
MDR_DIALECT_CHOICE (" Read ", " Read "), 24, MDR_DIALECT_CHOICE (" Read ", " Read "), 24,
new BMessage(M_READED), buttonIndex); new BMessage(M_READ), buttonIndex);
else else
fReadedButton = fButtonBar->AddButton( fReadButton = fButtonBar->AddButton(
MDR_DIALECT_CHOICE ("Unread", "Unread"), 28, MDR_DIALECT_CHOICE ("Unread", "Unread"), 28,
new BMessage(M_UNREAD), buttonIndex); new BMessage(M_UNREAD), buttonIndex);
} }
@@ -3161,10 +3161,10 @@ void
TMailWindow::_UpdateReadButton() TMailWindow::_UpdateReadButton()
{ {
if (fApp->ShowButtonBar()) { if (fApp->ShowButtonBar()) {
fButtonBar->RemoveButton(fReadedButton); fButtonBar->RemoveButton(fReadButton);
fReadedButton = NULL; fReadButton = NULL;
if (!fAutoMarkReaded && !fReadedButton) { if (!fAutoMarkRead && !fReadButton) {
_AddReadedButton(); _AddReadButton();
} }
} }
UpdateViews(); UpdateViews();
src/apps/mail/MailWindow.h
+4 -4
View File
@@ -107,7 +107,7 @@ class TMailWindow : public BWindow {
void SaveTrackerPosition(entry_ref*); void SaveTrackerPosition(entry_ref*);
void SetOriginatingWindow(BWindow* window); void SetOriginatingWindow(BWindow* window);
void SetCurrentMessageRead(bool readed = true); void SetCurrentMessageRead(bool read = true);
void SetTrackerSelectionToCurrent(); void SetTrackerSelectionToCurrent();
TMailWindow* FrontmostWindow(); TMailWindow* FrontmostWindow();
void UpdateViews(); void UpdateViews();
@@ -126,7 +126,7 @@ class TMailWindow : public BWindow {
void _RebuildQueryMenu(bool firstTime = false); void _RebuildQueryMenu(bool firstTime = false);
char* _BuildQueryString(BEntry* entry) const; char* _BuildQueryString(BEntry* entry) const;
void _AddReadedButton(); void _AddReadButton();
void _UpdateReadButton(); void _UpdateReadButton();
TMailApp* fApp; TMailApp* fApp;
@@ -198,8 +198,8 @@ class TMailWindow : public BWindow {
entry_ref fRepliedMail; entry_ref fRepliedMail;
BMessenger* fOriginatingWindow; BMessenger* fOriginatingWindow;
bool fAutoMarkReaded : 1; bool fAutoMarkRead : 1;
BmapButton* fReadedButton; BmapButton* fReadButton;
BmapButton* fNextButton; BmapButton* fNextButton;
}; };
src/apps/mail/Messages.h
+1 -1
View File
@@ -113,7 +113,7 @@ enum MENUS {
M_COPY, M_COPY,
// nav // nav
M_READED, M_READ,
M_UNREAD, M_UNREAD,
M_NEXTMSG, M_NEXTMSG,
M_PREVMSG, M_PREVMSG,
src/apps/mail/Prefs.cpp
+17 -17
View File
@@ -100,7 +100,7 @@ enum P_MESSAGES {P_OK = 128, P_CANCEL, P_REVERT, P_FONT,
P_SIG, P_ENC, P_WARN_UNENCODABLE, P_SIG, P_ENC, P_WARN_UNENCODABLE,
P_SPELL_CHECK_START_ON, P_BUTTON_BAR, P_SPELL_CHECK_START_ON, P_BUTTON_BAR,
P_ACCOUNT, P_REPLYTO, P_REPLY_PREAMBLE, P_ACCOUNT, P_REPLYTO, P_REPLY_PREAMBLE,
P_COLORED_QUOTES, P_MARK_READED}; P_COLORED_QUOTES, P_MARK_READ};
#define ICON_LABEL_TEXT MDR_DIALECT_CHOICE ("Show Icons & Labels", "アイコンとラベル") #define ICON_LABEL_TEXT MDR_DIALECT_CHOICE ("Show Icons & Labels", "アイコンとラベル")
#define ICON_TEXT MDR_DIALECT_CHOICE ("Show Icons Only", "アイコンのみ") #define ICON_TEXT MDR_DIALECT_CHOICE ("Show Icons Only", "アイコンのみ")
@@ -137,7 +137,7 @@ add_menu_to_layout(BMenuField* menu, BGridLayout* layout, int32& row)
TPrefsWindow::TPrefsWindow(BRect rect, BFont* font, int32* level, bool* wrap, TPrefsWindow::TPrefsWindow(BRect rect, BFont* font, int32* level, bool* wrap,
bool* attachAttributes, bool* cquotes, uint32* account, int32* replyTo, bool* attachAttributes, bool* cquotes, uint32* account, int32* replyTo,
char** preamble, char** sig, uint32* encoding, bool* warnUnencodable, char** preamble, char** sig, uint32* encoding, bool* warnUnencodable,
bool* spellCheckStartOn, bool* autoMarkReaded, uint8* buttonBar) bool* spellCheckStartOn, bool* autoMarkRead, uint8* buttonBar)
: :
#if USE_LAYOUT_MANAGEMENT #if USE_LAYOUT_MANAGEMENT
BWindow(rect, MDR_DIALECT_CHOICE ("Mail Preferences", "Mailの設定"), BWindow(rect, MDR_DIALECT_CHOICE ("Mail Preferences", "Mailの設定"),
@@ -183,8 +183,8 @@ TPrefsWindow::TPrefsWindow(BRect rect, BFont* font, int32* level, bool* wrap,
fNewSpellCheckStartOn(spellCheckStartOn), fNewSpellCheckStartOn(spellCheckStartOn),
fSpellCheckStartOn(*fNewSpellCheckStartOn), fSpellCheckStartOn(*fNewSpellCheckStartOn),
fNewAutoMarkReaded(autoMarkReaded), fNewAutoMarkRead(autoMarkRead),
fAutoMarkReaded(*fNewAutoMarkReaded) fAutoMarkRead(*fNewAutoMarkRead)
{ {
strcpy(fSignature, *fNewSignature); strcpy(fSignature, *fNewSignature);
@@ -246,9 +246,9 @@ TPrefsWindow::TPrefsWindow(BRect rect, BFont* font, int32* level, bool* wrap,
fSpellCheckStartOnMenu, NULL); fSpellCheckStartOnMenu, NULL);
add_menu_to_layout(menu, interfaceLayout, layoutRow); add_menu_to_layout(menu, interfaceLayout, layoutRow);
fAutoMarkReadedMenu = _BuildAutoMarkReadedMenu(fAutoMarkReaded); fAutoMarkReadMenu = _BuildAutoMarkReadMenu(fAutoMarkRead);
menu = new BMenuField("autoMarkReaded", AUTO_MARK_READ_TEXT, menu = new BMenuField("autoMarkRead", AUTO_MARK_READ_TEXT,
fAutoMarkReadedMenu, NULL); fAutoMarkReadMenu, NULL);
add_menu_to_layout(menu, interfaceLayout, layoutRow); add_menu_to_layout(menu, interfaceLayout, layoutRow);
// Mail Accounts // Mail Accounts
@@ -414,9 +414,9 @@ TPrefsWindow::TPrefsWindow(BRect rect, BFont* font, int32* level, bool* wrap,
interfaceBox->AddChild(menu); interfaceBox->AddChild(menu);
r.OffsetBy(0, height + ITEM_SPACE); r.OffsetBy(0, height + ITEM_SPACE);
fAutoMarkReadedMenu = _BuildAutoMarkReadedMenu(fAutoMarkReaded); fAutoMarkReadMenu = _BuildAutoMarkReadMenu(fAutoMarkRead);
menu = new BMenuField("autoMarkReaded", AUTO_MARK_READ_TEXT, menu = new BMenuField("autoMarkRead", AUTO_MARK_READ_TEXT,
fAutoMarkReadedMenu, NULL); fAutoMarkReadMenu, NULL);
menu->SetDivider(labelWidth); menu->SetDivider(labelWidth);
menu->SetAlignment(B_ALIGN_RIGHT); menu->SetAlignment(B_ALIGN_RIGHT);
interfaceBox->AddChild(menu); interfaceBox->AddChild(menu);
@@ -593,7 +593,7 @@ TPrefsWindow::MessageReceived(BMessage* msg)
*fNewEncoding = fEncoding; *fNewEncoding = fEncoding;
*fNewWarnUnencodable = fWarnUnencodable; *fNewWarnUnencodable = fWarnUnencodable;
*fNewSpellCheckStartOn = fSpellCheckStartOn; *fNewSpellCheckStartOn = fSpellCheckStartOn;
*fNewAutoMarkReaded = fAutoMarkReaded; *fNewAutoMarkRead = fAutoMarkRead;
*fNewButtonBar = fButtonBar; *fNewButtonBar = fButtonBar;
be_app->PostMessage(PREFS_CHANGED); be_app->PostMessage(PREFS_CHANGED);
@@ -734,8 +734,8 @@ TPrefsWindow::MessageReceived(BMessage* msg)
case P_SPELL_CHECK_START_ON: case P_SPELL_CHECK_START_ON:
msg->FindBool("spellCheckStartOn", fNewSpellCheckStartOn); msg->FindBool("spellCheckStartOn", fNewSpellCheckStartOn);
break; break;
case P_MARK_READED: case P_MARK_READ:
msg->FindBool("autoMarkReaded", fNewAutoMarkReaded); msg->FindBool("autoMarkRead", fNewAutoMarkRead);
be_app->PostMessage(PREFS_CHANGED); be_app->PostMessage(PREFS_CHANGED);
break; break;
case P_BUTTON_BAR: case P_BUTTON_BAR:
@@ -764,7 +764,7 @@ TPrefsWindow::MessageReceived(BMessage* msg)
|| fEncoding != *fNewEncoding || fEncoding != *fNewEncoding
|| fWarnUnencodable != *fNewWarnUnencodable || fWarnUnencodable != *fNewWarnUnencodable
|| fSpellCheckStartOn != *fNewSpellCheckStartOn || fSpellCheckStartOn != *fNewSpellCheckStartOn
|| fAutoMarkReaded != *fNewAutoMarkReaded || fAutoMarkRead != *fNewAutoMarkRead
|| fButtonBar != *fNewButtonBar; || fButtonBar != *fNewButtonBar;
fRevert->SetEnabled(changed); fRevert->SetEnabled(changed);
} }
@@ -1124,10 +1124,10 @@ TPrefsWindow::_BuildSpellCheckStartOnMenu(bool spellCheckStartOn)
BPopUpMenu* BPopUpMenu*
TPrefsWindow::_BuildAutoMarkReadedMenu(bool autoMarkReaded) TPrefsWindow::_BuildAutoMarkReadMenu(bool autoMarkRead)
{ {
return _BuildBoolMenu(P_MARK_READED, "autoMarkReaded", return _BuildBoolMenu(P_MARK_READ, "autoMarkRead",
autoMarkReaded); autoMarkRead);
} }
src/apps/mail/Prefs.h
+6 -6
View File
@@ -70,7 +70,7 @@ public:
char** preamble, char** sig, char** preamble, char** sig,
uint32* encoding, bool* warnUnencodable, uint32* encoding, bool* warnUnencodable,
bool* spellCheckStartOn, bool* spellCheckStartOn,
bool* autoMarkReaded, uint8* buttonBar); bool* autoMarkRead, uint8* buttonBar);
virtual ~TPrefsWindow(); virtual ~TPrefsWindow();
virtual void MessageReceived(BMessage* message); virtual void MessageReceived(BMessage* message);
@@ -91,8 +91,8 @@ private:
bool warnUnencodable); bool warnUnencodable);
BPopUpMenu* _BuildSpellCheckStartOnMenu( BPopUpMenu* _BuildSpellCheckStartOnMenu(
bool spellCheckStartOn); bool spellCheckStartOn);
BPopUpMenu* _BuildAutoMarkReadedMenu( BPopUpMenu* _BuildAutoMarkReadMenu(
bool autoMarkReaded); bool autoMarkRead);
BPopUpMenu* _BuildButtonBarMenu(uint8 show); BPopUpMenu* _BuildButtonBarMenu(uint8 show);
BPopUpMenu* _BuildBoolMenu(uint32 msg, BPopUpMenu* _BuildBoolMenu(uint32 msg,
@@ -123,8 +123,8 @@ private:
bool fWarnUnencodable; bool fWarnUnencodable;
bool* fNewSpellCheckStartOn; bool* fNewSpellCheckStartOn;
bool fSpellCheckStartOn; bool fSpellCheckStartOn;
bool* fNewAutoMarkReaded; bool* fNewAutoMarkRead;
bool fAutoMarkReaded; bool fAutoMarkRead;
BButton* fRevert; BButton* fRevert;
@@ -142,7 +142,7 @@ private:
BPopUpMenu* fWarnUnencodableMenu; BPopUpMenu* fWarnUnencodableMenu;
BPopUpMenu* fSpellCheckStartOnMenu; BPopUpMenu* fSpellCheckStartOnMenu;
BPopUpMenu* fButtonBarMenu; BPopUpMenu* fButtonBarMenu;
BPopUpMenu* fAutoMarkReadedMenu; BPopUpMenu* fAutoMarkReadMenu;
}; };
#endif /* _PREFS_H */ #endif /* _PREFS_H */