kotatogram/kotatogram-desktop
kotatogram/kotatogram-desktop
1
0
Fork 0
Code Issues Releases 45 Packages Wiki Activity

Restore media grouping options for quoted forward

Browse source 
They aren't working for photos, but work fine for files.
This commit is contained in:
Eric Kotato 2020-11-09 10:48:51 +03:00
parent e5123d56df
commit f7025ba3b2
2 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Telegram/SourceFiles/boxes/share_box.cpp
View file

@ -531,9 +531,6 @@ bool ShareBox::showMenu(not_null<Ui::IconButton*> button) {
} }
if (cForwardAlbumsAsIs() || !cForwardGrouped()) { if (cForwardAlbumsAsIs() || !cForwardGrouped()) {
_menu->addAction(tr::ktg_forward_menu_group_all_media(tr::now), [=] { _menu->addAction(tr::ktg_forward_menu_group_all_media(tr::now), [=] {
if (cForwardQuoted()) {
cSetForwardQuoted(false);
}
cSetForwardAlbumsAsIs(false); cSetForwardAlbumsAsIs(false);
cSetForwardGrouped(true); cSetForwardGrouped(true);
updateAdditionalTitle(); updateAdditionalTitle();
@ -541,9 +538,6 @@ bool ShareBox::showMenu(not_null<Ui::IconButton*> button) {
} }
if (cForwardAlbumsAsIs() || cForwardGrouped()) { if (cForwardAlbumsAsIs() || cForwardGrouped()) {
_menu->addAction(tr::ktg_forward_menu_separate_messages(tr::now), [=] { _menu->addAction(tr::ktg_forward_menu_separate_messages(tr::now), [=] {
if (cForwardQuoted()) {
cSetForwardQuoted(false);
}
cSetForwardAlbumsAsIs(false); cSetForwardAlbumsAsIs(false);
cSetForwardGrouped(false); cSetForwardGrouped(false);
updateAdditionalTitle(); updateAdditionalTitle();
@ -572,7 +566,7 @@ void ShareBox::updateAdditionalTitle() {
: tr::ktg_forward_subtitle_uncaptioned(tr::now)); : tr::ktg_forward_subtitle_uncaptioned(tr::now));
} }
if (!cForwardQuoted() && _hasMediaMessages && !cForwardAlbumsAsIs()) { if (_hasMediaMessages && !cForwardAlbumsAsIs()) {
if (!result.isEmpty()) { if (!result.isEmpty()) {
result += ", "; result += ", ";
} }

8
Telegram/SourceFiles/history/history_widget.cpp
View file

@ -5307,9 +5307,6 @@ void HistoryWidget::contextMenuEvent(QContextMenuEvent *e) {
} }
if (cForwardAlbumsAsIs() || !cForwardGrouped()) { if (cForwardAlbumsAsIs() || !cForwardGrouped()) {
_menu->addAction(tr::ktg_forward_menu_group_all_media(tr::now), [=] { _menu->addAction(tr::ktg_forward_menu_group_all_media(tr::now), [=] {
if (cForwardQuoted()) {
cSetForwardQuoted(false);
}
cSetForwardAlbumsAsIs(false); cSetForwardAlbumsAsIs(false);
cSetForwardGrouped(true); cSetForwardGrouped(true);
updateForwardingTexts(); updateForwardingTexts();
@ -5317,9 +5314,6 @@ void HistoryWidget::contextMenuEvent(QContextMenuEvent *e) {
} }
if (cForwardAlbumsAsIs() || cForwardGrouped()) { if (cForwardAlbumsAsIs() || cForwardGrouped()) {
_menu->addAction(tr::ktg_forward_menu_separate_messages(tr::now), [=] { _menu->addAction(tr::ktg_forward_menu_separate_messages(tr::now), [=] {
if (cForwardQuoted()) {
cSetForwardQuoted(false);
}
cSetForwardAlbumsAsIs(false); cSetForwardAlbumsAsIs(false);
cSetForwardGrouped(false); cSetForwardGrouped(false);
updateForwardingTexts(); updateForwardingTexts();
@ -6618,7 +6612,7 @@ void HistoryWidget::updateForwardingTexts() {
: qsl(", ") + (cForwardCaptioned() : qsl(", ") + (cForwardCaptioned()
? tr::ktg_forward_subtitle_unquoted(tr::now) ? tr::ktg_forward_subtitle_unquoted(tr::now)
: tr::ktg_forward_subtitle_uncaptioned(tr::now))) : tr::ktg_forward_subtitle_uncaptioned(tr::now)))
+ (cForwardQuoted() || cForwardAlbumsAsIs() || !hasMediaToGroup + (cForwardAlbumsAsIs() || !hasMediaToGroup
? QString() ? QString()
: qsl(", ") + (cForwardGrouped() : qsl(", ") + (cForwardGrouped()
? tr::ktg_forward_subtitle_group_all_media(tr::now) ? tr::ktg_forward_subtitle_group_all_media(tr::now)