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

Leave status when quit window using the control+shift+w shortcut. Fixes #7382.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41063 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Clemens Zeidler
2011-03-21 09:38:12 +00:00
parent a64bd5649d
commit f1785f82fe
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/mail/MailWindow.cpp
+6 -8
View File
@@ -188,7 +188,6 @@ TMailWindow::TMailWindow(BRect rect, const char* title, TMailApp* app,
BMenu* subMenu; BMenu* subMenu;
BMenuItem* item; BMenuItem* item;
BMessage* msg; BMessage* msg;
attr_info info;
BFile file(ref, B_READ_ONLY); BFile file(ref, B_READ_ONLY);
if (ref) { if (ref) {
@@ -240,14 +239,13 @@ TMailWindow::TMailWindow(BRect rect, const char* title, TMailApp* app,
menu->AddSeparatorItem(); menu->AddSeparatorItem();
subMenu = new BMenu(B_TRANSLATE("Close and ")); subMenu = new BMenu(B_TRANSLATE("Close and "));
if (file.GetAttrInfo(B_MAIL_ATTR_STATUS, &info) == B_NO_ERROR)
file.ReadAttr(B_MAIL_ATTR_STATUS, B_STRING_TYPE, 0, str, info.size);
else
str[0] = 0;
if (!strcmp(str, "New")) { read_flags flag;
read_read_attr(file, flag);
if (flag == B_UNREAD) {
subMenu->AddItem(item = new BMenuItem(B_TRANSLATE("Leave as New"), subMenu->AddItem(item = new BMenuItem(B_TRANSLATE("Leave as New"),
new BMessage(B_QUIT_REQUESTED), 'W', B_SHIFT_KEY)); new BMessage(kMsgQuitAndKeepAllStatus), 'W', B_SHIFT_KEY));
#if 0 #if 0
subMenu->AddItem(item = new BMenuItem(B_TRANSLATE("Set to Read"), subMenu->AddItem(item = new BMenuItem(B_TRANSLATE("Set to Read"),
new BMessage(M_CLOSE_READ), 'W')); new BMessage(M_CLOSE_READ), 'W'));
@@ -260,7 +258,7 @@ TMailWindow::TMailWindow(BRect rect, const char* title, TMailApp* app,
subMenu->AddItem(item = new BMenuItem(status, subMenu->AddItem(item = new BMenuItem(status,
new BMessage(B_QUIT_REQUESTED), 'W')); new BMessage(B_QUIT_REQUESTED), 'W'));
AddShortcut('W', B_COMMAND_KEY | B_SHIFT_KEY, AddShortcut('W', B_COMMAND_KEY | B_SHIFT_KEY,
new BMessage(B_QUIT_REQUESTED)); new BMessage(kMsgQuitAndKeepAllStatus));
} }
subMenu->AddItem(new BMenuItem(B_TRANSLATE("Move to trash"), subMenu->AddItem(new BMenuItem(B_TRANSLATE("Move to trash"),