rnhmjoj
/
nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #154 from adasauce/image-modal-download 

Better image overlay handling when downloading
This commit is contained in:
DeepBlueV7.X 2020-03-20 20:28:43 +00:00 committed by GitHub
parent b41e2e6f18 d0a1e81f43
commit c32a8bc226
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/timeline/TimelineModel.cpp
View File

@ -1271,7 +1271,7 @@ TimelineModel::addPendingMessage(mtx::events::collections::TimelineEvents event)
emit nextPendingMessage();
}
void
bool
TimelineModel::saveMedia(QString eventId) const
{
mtx::events::collections::TimelineEvents event = events.value(eventId);
@ -1309,7 +1309,7 @@ TimelineModel::saveMedia(QString eventId) const
manager_->getWidget(), dialogTitle, openLocation, filterString);
if (filename.isEmpty())
return;
return false;
const auto url = mxcUrl.toStdString();
@ -1340,10 +1340,13 @@ TimelineModel::saveMedia(QString eventId) const
file.write(QByteArray(temp.data(), (int)temp.size()));
file.close();
return;
} catch (const std::exception &e) {
nhlog::ui()->warn("Error while saving file to: {}", e.what());
}
});
return true;
}
void

2
src/timeline/TimelineModel.h
View File

@ -186,7 +186,7 @@ public:
Q_INVOKABLE int idToIndex(QString id) const;
Q_INVOKABLE QString indexToId(int index) const;
Q_INVOKABLE void cacheMedia(QString eventId);
Q_INVOKABLE void saveMedia(QString eventId) const;
Q_INVOKABLE bool saveMedia(QString eventId) const;
void addEvents(const mtx::responses::Timeline &events);
template<class T>

17
src/timeline/TimelineViewManager.cpp
View File

@ -175,9 +175,20 @@ TimelineViewManager::openImageOverlay(QString mxcUrl, QString eventId) const
auto imgDialog = new dialogs::ImageOverlay(pixmap);
imgDialog->showFullScreen();
connect(imgDialog, &dialogs::ImageOverlay::saving, timeline_, [this, eventId]() {
timeline_->saveMedia(eventId);
});
connect(imgDialog,
&dialogs::ImageOverlay::saving,
timeline_,
[this, eventId, imgDialog]() {
// hide the overlay while presenting the save dialog for better
// cross platform support.
imgDialog->hide();
if (!timeline_->saveMedia(eventId)) {
imgDialog->show();
} else {
imgDialog->close();
}
});
});
}