Remove 'Send without sound' in Saved messages.

This commit is contained in:
John Preston 2019-08-31 14:43:19 +03:00
parent 451056d2ab
commit 66bf48e21e
3 changed files with 13 additions and 8 deletions

View File

@ -801,7 +801,7 @@ void SetupSendMenu(
}
*menu = base::make_unique_q<Ui::PopupMenu>(button);
if (silent) {
if (silent && now != SendMenuType::Reminder) {
(*menu)->addAction(tr::lng_send_silent_message(tr::now), silent);
}
if (schedule && now != SendMenuType::SilentOnly) {

View File

@ -303,7 +303,7 @@ HistoryWidget::HistoryWidget(
SetupSendMenu(
_send,
[=] { return sendMenuType(); },
[=] { return sendButtonMenuType(); },
[=] { sendSilent(); },
[=] { sendScheduled(); });
@ -2987,16 +2987,20 @@ void HistoryWidget::sendScheduled() {
}
SendMenuType HistoryWidget::sendMenuType() const {
if (_send->type() != Ui::SendButton::Type::Send
|| _send->isDisabled()
|| !_peer) {
return SendMenuType::Disabled;
}
return _peer->isSelf()
return !_peer
? SendMenuType::Disabled
: _peer->isSelf()
? SendMenuType::Reminder
: SendMenuType::Scheduled;
}
SendMenuType HistoryWidget::sendButtonMenuType() const {
return ((_send->type() != Ui::SendButton::Type::Send)
|| _send->isDisabled())
? SendMenuType::Disabled
: sendMenuType();
}
void HistoryWidget::unblockUser() {
if (const auto user = _peer ? _peer->asUser() : nullptr) {
Window::PeerMenuUnblockUserWithBotRestart(user);

View File

@ -368,6 +368,7 @@ private:
void sendSilent();
void sendScheduled();
[[nodiscard]] SendMenuType sendMenuType() const;
[[nodiscard]] SendMenuType sendButtonMenuType() const;
void handlePendingHistoryUpdate();
void fullPeerUpdated(PeerData *peer);
void toggleTabbedSelectorMode();