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

Change forwarding to unquoted when changing grouping mode

Browse source
This commit is contained in:
Eric Kotato 2020-11-08 10:29:48 +03:00
parent 6526e61f52
commit feafe56173
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -521,7 +521,7 @@ bool ShareBox::showMenu(not_null<Ui::IconButton*> button) {
updateAdditionalTitle(); updateAdditionalTitle();
}); });
} }
if (!cForwardQuoted() && _hasMediaMessages) { if (_hasMediaMessages) {
_menu->addSeparator(); _menu->addSeparator();
if (!cForwardAlbumsAsIs()) { if (!cForwardAlbumsAsIs()) {
_menu->addAction(tr::ktg_forward_menu_default_albums(tr::now), [=] { _menu->addAction(tr::ktg_forward_menu_default_albums(tr::now), [=] {
@ -531,6 +531,9 @@ 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();
@ -538,6 +541,9 @@ 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();

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

@ -5307,7 +5307,7 @@ void HistoryWidget::contextMenuEvent(QContextMenuEvent *e) {
updateForwardingTexts(); updateForwardingTexts();
}); });
} }
if (!cForwardQuoted() && hasMediaToGroup && count > 1) { if (hasMediaToGroup && count > 1) {
_menu->addSeparator(); _menu->addSeparator();
if (!cForwardAlbumsAsIs()) { if (!cForwardAlbumsAsIs()) {
_menu->addAction(tr::ktg_forward_menu_default_albums(tr::now), [=] { _menu->addAction(tr::ktg_forward_menu_default_albums(tr::now), [=] {
@ -5317,6 +5317,9 @@ 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();
@ -5324,6 +5327,9 @@ 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();