mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-08-31 14:38:15 +00:00
Code Issues Releases Wiki Activity

Implemented ability to add more than 1 file to albums via SendFilesBox.

Browse Source
This commit is contained in:
23rd
2020-01-21 23:31:34 +03:00
committed by John Preston
parent a482b744d2
commit e266dc153b
5 changed files with 68 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Telegram/SourceFiles/boxes/edit_caption_box.cpp
View File

@@ -488,26 +488,14 @@ void EditCaptionBox::updateEditMediaButton() {
void EditCaptionBox::createEditMediaButton() {
const auto callback = [=](FileDialog::OpenResult &&result) {
auto isValidFile = [](QString mimeType) {
if (Core::IsMimeSticker(mimeType)) {
Ui::show(
Box<InformBox>(tr::lng_edit_media_invalid_file(tr::now)),
Ui::LayerOption::KeepOther);
return false;
}
return true;
auto showBoxErrorCallback = [](tr::phrase<> t) {
Ui::show(Box<InformBox>(t(tr::now)), Ui::LayerOption::KeepOther);
};
auto list = Storage::PreparedList::PreparedFileFromFileDialog(
auto list = Storage::PreparedList::PreparedFileFromFilesDialog(
std::move(result),
_isAlbum,
[] {
Ui::show(
Box<InformBox>(tr::lng_edit_media_album_error(tr::now)),
Ui::LayerOption::KeepOther);
},
std::move(isValidFile),
std::move(showBoxErrorCallback),
st::sendMediaPreviewSize);
if (list) {

30
Telegram/SourceFiles/boxes/send_files_box.cpp
View File

@@ -129,27 +129,14 @@ void FileDialogCallback(
FileDialog::OpenResult &&result,
bool isAlbum,
Fn<void(Storage::PreparedList)> callback) {
auto isValidFile = [](QString mimeType) {
if (!Core::IsMimeSticker(mimeType)) {
return true;
}
Ui::show(
Box<InformBox>(tr::lng_edit_media_invalid_file(tr::now)),
Ui::LayerOption::KeepOther);
return false;
auto showBoxErrorCallback = [](tr::phrase<> text) {
Ui::show(Box<InformBox>(text(tr::now)), Ui::LayerOption::KeepOther);
};
auto errorCallback = [] {
Ui::show(
Box<InformBox>(tr::lng_edit_media_album_error(tr::now)),
Ui::LayerOption::KeepOther);
};
auto list = Storage::PreparedList::PreparedFileFromFileDialog(
auto list = Storage::PreparedList::PreparedFileFromFilesDialog(
std::move(result),
isAlbum,
std::move(errorCallback),
std::move(isValidFile),
std::move(showBoxErrorCallback),
st::sendMediaPreviewSize);
if (!list) {
@@ -1900,7 +1887,7 @@ void SendFilesBox::openDialogToAddFileToAlbum() {
});
};
FileDialog::GetOpenPath(
FileDialog::GetOpenPaths(
this,
tr::lng_choose_file(tr::now),
FileDialog::AlbumFilesFilter(),
@@ -2197,9 +2184,8 @@ bool SendFilesBox::addFiles(not_null<const QMimeData*> data) {
bool SendFilesBox::addFiles(Storage::PreparedList list) {
const auto sumFiles = _list.files.size() + list.files.size();
if (sumFiles > Storage::MaxAlbumItems()) {
return false;
} else if (list.error != Storage::PreparedList::Error::None) {
const auto cutToAlbumSize = (sumFiles > Storage::MaxAlbumItems());
if (list.error != Storage::PreparedList::Error::None) {
return false;
} else if (!IsSingleItem(list) && !list.albumIsPossible) {
return false;
@@ -2218,7 +2204,7 @@ bool SendFilesBox::addFiles(Storage::PreparedList list) {
&& _sendWay->value() == SendFilesWay::Photos) {
_sendWay->setValue(SendFilesWay::Album);
}
_list.mergeToEnd(std::move(list));
_list.mergeToEnd(std::move(list), cutToAlbumSize);
_compressConfirm = _compressConfirmInitial;
refreshAllAfterAlbumChanges();