From 8b1aaf348c30289eab0adc9799c1ce3e50473fd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Mon, 31 Aug 2015 08:10:39 +0200 Subject: [PATCH] Mail: properly disable prev/next buttons without Tracker. * The prev/next buttons will only work when invoked via an actual mail file from Tracker. --- src/apps/mail/MailWindow.cpp | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/apps/mail/MailWindow.cpp b/src/apps/mail/MailWindow.cpp index b11711c2f1..55d5431449 100644 --- a/src/apps/mail/MailWindow.cpp +++ b/src/apps/mail/MailWindow.cpp @@ -686,9 +686,10 @@ TMailWindow::BuildToolBar() B_TRANSLATE("Print")); fToolBar->AddAction(M_DELETE_NEXT, this, _RetrieveVectorIcon(4), NULL, B_TRANSLATE("Trash")); - if (fApp->ShowSpamGUI()) - fToolBar->AddAction(M_SPAM_BUTTON, this, _RetrieveVectorIcon(10), NULL, - B_TRANSLATE("Spam")); + if (fApp->ShowSpamGUI()) { + fToolBar->AddAction(M_SPAM_BUTTON, this, _RetrieveVectorIcon(10), + NULL, B_TRANSLATE("Spam")); + } fToolBar->AddSeparator(); fToolBar->AddAction(M_NEXTMSG, this, _RetrieveVectorIcon(6), NULL, B_TRANSLATE("Next")); @@ -701,6 +702,11 @@ TMailWindow::BuildToolBar() fToolBar->AddAction(M_PREVMSG, this, _RetrieveVectorIcon(7), NULL, B_TRANSLATE("Previous")); + if (!fTrackerMessenger.IsValid()) { + fToolBar->SetActionEnabled(M_NEXTMSG, false); + fToolBar->SetActionEnabled(M_PREVMSG, false); + } + if (!fAutoMarkRead) _AddReadButton(); } @@ -950,11 +956,6 @@ TMailWindow::MenusBeginning() } else { fCut->SetEnabled(false); fPaste->SetEnabled(false); - - if (!fTrackerMessenger.IsValid()) { - fNextMsg->SetEnabled(false); - fPrevMsg->SetEnabled(false); - } } }